Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 6762:f67d1468ac50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: add sort helper
author Matt Mackall <mpm@selenic.com>
date Fri, 27 Jun 2008 18:28:45 -0500
parents f6c00b17387c
children 482581431dcd
line wrap: on
line diff
--- 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: