[Webkit-unassigned] [Bug 21457] New: resolve-ChangeLogs should be able to operate on a git revision range

[bugzilla-daemon at webkit.org]

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

           Summary: resolve-ChangeLogs should be able to operate on a git
                    revision range
           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, mrowe at apple.com, aroben at apple.com


* SUMMARY
The resolve-ChangeLogs script should be able to operate on a git revision range
so it can re-merge multiple commits.

* STEPS TO REPRODUCE
This scenario commonly happens when the developer commits a ChangeLog entry to
an external repository (e.g., to svn), then commits more than one additional
patch locally (changing the same ChangeLog file, e.g., to git), while another
developer commits a ChangeLog entry to the external repository (svn).

When the developer attempts to rebase their local commits, git tends to merge
the ChangeLogs such that the new (local) ChangeLog entries appear just above
their entry committed to svn, rather than at the top of the file.  (See also
Bug 21185.)

* NOTES
The patch that will be attached adds another way to invoke resolve-ChangeLogs
to fix ChangeLog entries throughout a revision range:

resolve-ChangeLogs -f revision..range
resolve-ChangeLogs -f     # implies: HEAD^..HEAD
resolve-ChangeLogs -f commitish     # implies commitish..HEAD


-- 
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.