Created attachment 51573 [details]
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.)
(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(-)
Comment on attachment 51573 [details]
Created attachment 51574 [details]
Please ignore the description in Comment #0.
Comment on attachment 51574 [details]
Attachment 51574 [details] was posted by a committer and has review+, assigning to David Kilzer for commit.
Committed r56483: <http://trac.webkit.org/changeset/56483>