[Webkit-unassigned] [Bug 83702] resolve-ChangeLogs incorrectly duplicates entries landed via CQ

[bugzilla-daemon at webkit.org]

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





--- Comment #7 from Ami Fischman <fischman at chromium.org>  2012-06-20 23:26:20 PST ---
I dug into this a bit tonight and was disappointed to find that r-CL is a wrapper around diff+patch, as opposed to something that grokked CL entries directly.  Played with some heuristics around classifying a base->ours diff as ignorable in the context of a base->theirs diff, but couldn't come up with a reasonable story.

Sadly I think actually implementing this will require teaching VCSUtils.pm how to parse ChangeLogs and reason about adds/removes/edits and how to combine them.

On the bright side, r-CL as a git merge-driver is just a wrapper around VCSUtils.pm:mergeChangeLogs(), which *is* unittested: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl

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