[Webkit-unassigned] [Bug 21185] New: resolve-ChangeLogs should be able to fix poorly merged ChangeLog entries after a git svn rebase

[bugzilla-daemon at webkit.org]

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

           Summary: resolve-ChangeLogs should be able to fix poorly merged
                    ChangeLog entries after a git svn rebase
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Macintosh
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: eric at webkit.org, aroben at apple.com


* SUMMARY
When working in a local git repository and pushing commits to the WebKit svn
directory, there are times when a "git svn rebase" will cause the ChangeLog
entry for a locally committed patch to be merged incorrectly (e.g., not at the
top of the ChangeLog file).

* STEPS TO REPRODUCE
1. You push a patch from git to svn (using git svn dcommit).
2. You commit another patch locally to git, such that a new ChangeLog entry has
the same "date header" as the previous one (which is already committed to svn).
3. Someone else commits a ChangeLog entry above the entry from Step 1.
4. You're ready to commit your second patch, so you run "git svn rebase" to
pull in svn commits and rebase your patch.

* RESULTS
After running "git svn rebase", git merges the ChangeLog entry for your second
patch somewhere in the "middle" of the ChangeLog file, not at the top as you
expected.

* WORKAROUND
Currently, your only option is to manually edit the ChangeLog file to correct
it.


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