Bug 36560 - resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge
Summary: resolve-ChangeLogs: git-rebase fails when resolve-ChangeLogs can't merge
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-24 14:57 PDT by David Kilzer (:ddkilzer)
Modified: 2010-03-24 20:50 PDT (History)
3 users (show)

See Also:


Attachments
Patch 1/2 (15.02 KB, patch)
2010-03-24 14:57 PDT, David Kilzer (:ddkilzer)
eric: review+
Details | Formatted Diff | Diff
Patch 1/2 (webkit-patch FAIL) (15.02 KB, patch)
2010-03-24 14:59 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff
Patch 1/2 (webkit-patch FAIL AGAIN) (15.02 KB, patch)
2010-03-24 15:06 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff
Patch 1/2 (USER FAIL) (15.02 KB, patch)
2010-03-24 15:08 PDT, David Kilzer (:ddkilzer)
no flags Details | Formatted Diff | Diff
Patch 2/2 (5.09 KB, patch)
2010-03-24 15:09 PDT, David Kilzer (:ddkilzer)
eric: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 2010-03-24 14:57:30 PDT
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
Comment 1 David Kilzer (:ddkilzer) 2010-03-24 14:59:32 PDT
Created attachment 51552 [details]
Patch 1/2 (webkit-patch FAIL)
Comment 2 David Kilzer (:ddkilzer) 2010-03-24 15:05:46 PDT
Comment on attachment 51552 [details]
Patch 1/2 (webkit-patch FAIL)

This is a dupe of Attachment #51549 [details].
Comment 3 David Kilzer (:ddkilzer) 2010-03-24 15:06:23 PDT
Created attachment 51555 [details]
Patch 1/2 (webkit-patch FAIL AGAIN)
Comment 4 David Kilzer (:ddkilzer) 2010-03-24 15:07:11 PDT
Comment on attachment 51555 [details]
Patch 1/2 (webkit-patch FAIL AGAIN)

Another duplicate of Attachment #51549 [details].
Comment 5 David Kilzer (:ddkilzer) 2010-03-24 15:08:00 PDT
Created attachment 51556 [details]
Patch 1/2 (USER FAIL)
Comment 6 David Kilzer (:ddkilzer) 2010-03-24 15:09:51 PDT
Created attachment 51557 [details]
Patch 2/2
Comment 7 Eric Seidel (no email) 2010-03-24 15:11:45 PDT
Holy pile of unit-tests, Batman.
Comment 8 Eric Seidel (no email) 2010-03-24 15:13:33 PDT
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.
Comment 9 David Kilzer (:ddkilzer) 2010-03-24 15:18:31 PDT
(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).
Comment 10 Eric Seidel (no email) 2010-03-24 15:27:54 PDT
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!
Comment 11 David Kilzer (:ddkilzer) 2010-03-24 16:51:40 PDT
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>
Comment 12 Eric Seidel (no email) 2010-03-24 16:56:10 PDT
We really need to invent a fancy git version of webkit-patch land for you. :)
Comment 13 David Kilzer (:ddkilzer) 2010-03-24 20:50:03 PDT
(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.