Mercurial > public > mercurial-scm > evolve
diff hgext/evolve.py @ 901:4f84b3307dc2 stable
Fix preservation of rename information on evolve (#33)
Following what rebase itself does, call duplicatecopies between
rebasenode and concludenode.
Should fix
https://bitbucket.org/marmoute/mutable-history/issue/33/evolve-command-loses-copy-metadata
| author | Julien Cristau <julien.cristau@logilab.fr> |
|---|---|
| date | Mon, 14 Apr 2014 18:16:35 +0200 |
| parents | 12ed6dfa8eea |
| children | c17ab719da56 3b7dfa9bb789 |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Apr 04 01:07:27 2014 +0200 +++ b/hgext/evolve.py Mon Apr 14 18:16:35 2014 +0200 @@ -745,7 +745,6 @@ 'no support for evolution merge changesets yet', hint="Redo the merge a use `hg prune` to obsolete the old one") destbookmarks = repo.nodebookmarks(dest.node()) - cmdutil.duplicatecopies(repo, orig.node(), dest.node()) nodesrc = orig.node() destphase = repo[nodesrc].phase() try: @@ -754,6 +753,7 @@ if r[-1]: #some conflict raise util.Abort( 'unresolved merge conflicts (see hg help resolve)') + cmdutil.duplicatecopies(repo, orig.node(), dest.node()) nodenew = rebase.concludenode(repo, orig.node(), dest.node(), node.nullid) except util.Abort, exc: