changeset 6762 | f67d1468ac50 |
parent 6747 | f6c00b17387c |
child 6805 | 482581431dcd |
--- a/mercurial/merge.py Fri Jun 27 14:53:30 2008 -0500 +++ b/mercurial/merge.py Fri Jun 27 18:28:45 2008 -0500 @@ -262,11 +262,10 @@ "apply the merge action list to the working directory" updated, merged, removed, unresolved = 0, 0, 0, 0 - action.sort() - ms = mergestate(repo) ms.reset(wctx.parents()[0].node()) moves = [] + action.sort() # prescan for merges for a in action: