2010-07-09 Adam Barth <abarth@webkit.org>
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jul 2010 09:40:26 +0000 (09:40 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jul 2010 09:40:26 +0000 (09:40 +0000)
commit2d62dd2a567dcc1be6b9bbc3bcda535f80c73146
tree1214fcb32d86f863d1950443f7ef9b31c09190a5
parente51d676520faafc39f629c6f2de72230b5781772
2010-07-09  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        commit-queue should merge to TOT when checkout needs update
        https://bugs.webkit.org/show_bug.cgi?id=41944

        There are a bunch of different designs that are possible here.  This
        one merges to top of tree by cleaning out the working copy and
        re-applying the patch.  Once you decide to merge that way, you need to
        decide who's going to retry.  In this patch, we retry in the child
        process instead of plumbing the failure reason to the master process.

        This patch is difficult to test end-to-end, but hopefully it will work.
        :)

        * Scripts/webkitpy/tool/commands/queues.py:
        * Scripts/webkitpy/tool/commands/stepsequence.py:
        * Scripts/webkitpy/tool/multicommandtool.py:
        * Scripts/webkitpy/tool/multicommandtool_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKitTools/ChangeLog
WebKitTools/Scripts/webkitpy/tool/commands/queues.py
WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py
WebKitTools/Scripts/webkitpy/tool/multicommandtool.py
WebKitTools/Scripts/webkitpy/tool/multicommandtool_unittest.py