[Webkit-unassigned] [Bug 36570] New: resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge

[bugzilla-daemon at webkit.org]

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

           Summary: resolve-ChangeLogs: git-rebase fails when
                    resolve-ChangeLogs can't merge
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: Other
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: New Bugs
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: ddkilzer at webkit.org
                CC: eric at webkit.org, vestbo at webkit.org,
                    cjerdonek at webkit.org



David Kilzer (ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #51573|                            |review?
               Flag|                            |


Created an attachment (id=51573)
 --> (https://bugs.webkit.org/attachment.cgi?id=51573)
Patch

Reviewed by Eric Seidel.

When resolve-ChangeLogs fails to merge a patch while running as
a git merge driver, it deletes the original file, which causes
an internal failure and stops git mid-merge:

fatal: Failed to execute internal merge

The fix is to use the --force switch with patch so that it will
always attempt to apply the patch.  (The change in
mergeChangeLogs() for the previous commit also fixed this, but
adding --force also prevents any potential user interaction that
patch may want to display.)

* Scripts/VCSUtils.pm:
(mergeChangeLogs): Added --force switch to patch command.  Also
changed to use the exit status from the patch command to
determine the return value for this method.
* Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl: Added
test to cover this bug.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56472
268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 3 files changed, 99 insertions(+), 5 deletions(-)

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