Bug 36560 – resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[David Kilzer (:ddkilzer)]

Created attachment 51549 [details]
Patch 1/2

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

[David Kilzer (:ddkilzer)]

Created attachment 51552 [details]
Patch 1/2 (webkit-patch FAIL)

[David Kilzer (:ddkilzer)]

Comment on attachment 51552 [details]
Patch 1/2 (webkit-patch FAIL)

This is a dupe of Attachment #51549 [details].

[David Kilzer (:ddkilzer)]

Created attachment 51555 [details]
Patch 1/2 (webkit-patch FAIL AGAIN)

[David Kilzer (:ddkilzer)]

Comment on attachment 51555 [details]
Patch 1/2 (webkit-patch FAIL AGAIN)

Another duplicate of Attachment #51549 [details].

[David Kilzer (:ddkilzer)]

Created attachment 51556 [details]
Patch 1/2 (USER FAIL)

[David Kilzer (:ddkilzer)]

Created attachment 51557 [details]
Patch 2/2

[Eric Seidel (no email)]

Holy pile of unit-tests, Batman.

[Eric Seidel (no email)]

Comment on attachment 51557 [details]
Patch 2/2

I am a perl weenie.  But it looks sane.  If you need someone who actually speaks perl to review, you should feel encouraged to request additional review.  Patch 1 of 2 might be beyond my perl comfort zone, but I'll stare a bit.

[David Kilzer (:ddkilzer)]

(In reply to comment #8)
>  Patch 1 of 2 might be beyond my perl comfort zone, but I'll stare a bit.

Thanks, Eric!  Patch 1/2 is mostly code movement and new unit test code (with a couple minor tweaks to the moved code).

[Eric Seidel (no email)]

Comment on attachment 51549 [details]
Patch 1/2

This is more of a rubber-stamp than a review.  But it does look sane to me.  Thanks!

[David Kilzer (:ddkilzer)]

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/VCSUtils.pm
	M	WebKitTools/Scripts/resolve-ChangeLogs
	A	WebKitTools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl
Committed r56471
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/VCSUtils.pm
	M	WebKitTools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl
Committed r56472

<http://trac.webkit.org/changeset/56471>
<http://trac.webkit.org/changeset/56472>

[Eric Seidel (no email)]

We really need to invent a fancy git version of webkit-patch land for you. :)

[David Kilzer (:ddkilzer)]

(In reply to comment #12)
> We really need to invent a fancy git version of webkit-patch land for you. :)

I can try to work on it when I have time.  Thanks.