Mercurial > hg-stable
changeset 1495:1e265c2bec94
Deal with merge abort more gracefully
We save parent info last rather than first.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 02 Nov 2005 20:22:29 -0800 |
| parents | 249ca10d37f4 |
| children | 3cf287a03664 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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"""