[Webkit-unassigned] [Bug 28831] Make ElementTimeControl methods return void and not throw

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Thu Sep 10 15:04:04 PDT 2009


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





--- Comment #16 from Eric Seidel <eric at webkit.org>  2009-09-10 15:04:04 PDT ---
(In reply to comment #15)
> (In reply to comment #14)
> > (From update of attachment 38852 [details] [details])
> > Race condition when landing the change.
> > Merge conflict during commit: Your file or directory 'WebCore/ChangeLog' is
> > probably out-of-date: resource out of date; try updating at
> > /usr/local/libexec/git-core//git-svn line 469
> 
> Can we recognize that error and not mark the patch commit-queue- ?

Yes, but even if we recognize it we have to be able to recover from it.

We can't update w/o having to fix ChangeLogs and deal with possible ChangeLog
conflicts during git rebase or update-webkit.  If update-webkit was smart
enough to handle ChangeLog conflicts for both git and svn we could use it, but
it's not yet.

I could make the commit-queue to just abort the run silently and loop back to
the top in that case.  That's slightly dangerous as we might infinite loop, but
I agree that behavior would be much better than marking cq-.

I'll file a bug and make the change.

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



More information about the webkit-unassigned mailing list