[Webkit-unassigned] [Bug 99507] Commit queue tried to land the wrong patch

[bugzilla-daemon at webkit.org]

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





--- Comment #2 from Emil A Eklund <eae at chromium.org>  2012-10-16 14:40:57 PST ---
(In reply to comment #1)
> The bug is just that the two patches landed close to each other and the commit-queue didn't know how to resolve the conflict in the ChangeLog.  We used to have a merge-driver on the bots that knew how to fix these things, but it had other problems.  We just need to teach the bot that it shouldn't bother trying to resolve conflicts when landing.

Are you sure? It looks a lot like it tried to grab the wrong patch as the file it is complaining about (Tools/ChangeLog) isn't even in the patch it should have applied.

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