# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1130991749 28800
# Node ID 1e265c2bec9442573e75514fe04d56c373780804
# Parent  249ca10d37f42626e165be9be6c93d1dacfc13d6
Deal with merge abort more gracefully

We save parent info last rather than first.



diff -r 249ca10d37f4 -r 1e265c2bec94 mercurial/localrepo.py
--- 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"""