[webkit-reviews] review requested: [Bug 36570] resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge : [Attachment 51573] Patch

[bugzilla-daemon at webkit.org]

David Kilzer (ddkilzer) <ddkilzer at webkit.org> has asked  for review:
Bug 36570: resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't
merge
https://bugs.webkit.org/show_bug.cgi?id=36570

Attachment 51573: Patch
https://bugs.webkit.org/attachment.cgi?id=51573&action=review

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
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(-)