[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 #5 from Ami Fischman <fischman at chromium.org>  2012-06-20 08:04:53 PST ---
(In reply to comment #4)
> I don't think `git pull --rebase` is really what you want here. Your patch has been landed for you, so you want to throw away your local commit entirely. If you know that you don't have any other changes on your branch that you need to keep around, you could just do `git fetch && git reset --hard origin/master` or similar.

Right.  The point of using rebase is to *verify* that the upstream change includes everything from the branch (and getting the warm fuzzies from [git branch -d] as opposed to getting the cold willies from [git branch -D]).

> I guess another option would be to write a script that first does `git pull --rebase` then looks for these ChangeLog-only commits and removes them.

Well, that script would ideally look for the same ChangeLog change earlier in the file (modulo "Reviewed by") to confirm that the entry landed as intended, too.  At that point ISTM it would be better to have resolve-ChangeLogs do that work.

Adam: do you know if there's anything like a test for resolve-ChangeLogs?

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