[Webkit-unassigned] [Bug 28721] New: WebKit needs a git-merge-changelogs

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=28721

           Summary: WebKit needs a git-merge-changelogs
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: eric at webkit.org
                CC: aroben at apple.com


WebKit needs a git-merge-changelogs

Git has the ability to specify custom merge drivers on a per-file basis.
See "man gitattributes" or
http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html for more
information.

the gnu folks over at gnulib have already written a git-merge-changelog:
http://cyberelk.net/tim/2008/05/29/git-merge-changelog/

Sadly, it's in C, and has a bunch of dependencies on gnu stuff.  It's also
GPL'd.


Another kink is that although it's possible to edit the root ".gitattributes"
file and check in a mapping from "ChangeLog" to a specific merge driver, merge
drivers have to be defined in a git config file, which must be either in
.git/config or ~/.gitconfig. :(  So we'd have to have an installer to set up
using a git-merge-changelog script if we wrote one.  That should be easy since
"git config" already handles reading/writing from .git/config files nicely.

I looked briefly at writing this today.  The merge driver is passed paths to 3
temp files.  1. previous version 2. other branch version.  3.  this branch
version.  Maybe one of the other WebKit git users will get further than I did.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.