Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deal with merge abort more gracefully
authorMatt Mackall <mpm@selenic.com>
Wed, 02 Nov 2005 20:22:29 -0800
changeset 1495 1e265c2bec94
parent 1494 249ca10d37f4
child 1496 3cf287a03664
Deal with merge abort more gracefully We save parent info last rather than first.
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Wed Nov 02 20:09:19 2005 -0800
+++ b/mercurial/localrepo.py	Wed Nov 02 20:22:29 2005 -0800
@@ -1504,9 +1504,6 @@
                 return 1
             branch_merge = True
 
-        if moddirstate:
-            self.dirstate.setparents(p1, p2)
-
         # get the files we don't need to change
         files = get.keys()
         files.sort()
@@ -1559,6 +1556,9 @@
             else:
                 self.dirstate.forget(remove)
 
+        if moddirstate:
+            self.dirstate.setparents(p1, p2)
+
     def merge3(self, fn, my, other):
         """perform a 3-way merge in the working directory"""
Mercurial