# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1398211480 25200
# Node ID c17ab719da5634f5aab4ff41a8762d0f71304bc3
# Parent  24f59f38a2027e75180fefaf33352c67a65c9711# Parent  69872cef605349ee6126b8df0bdab76a8a6786c2
merge with stable

diff -r 24f59f38a202 -r c17ab719da56 hgext/evolve.py
--- a/hgext/evolve.py	Tue Apr 22 17:15:05 2014 -0700
+++ b/hgext/evolve.py	Tue Apr 22 17:04:40 2014 -0700
@@ -808,7 +808,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:
@@ -817,6 +816,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:
diff -r 24f59f38a202 -r c17ab719da56 tests/test-evolve.t
--- a/tests/test-evolve.t	Tue Apr 22 17:15:05 2014 -0700
+++ b/tests/test-evolve.t	Tue Apr 22 17:04:40 2014 -0700
@@ -679,3 +679,28 @@
           longer length:             10
           median length:             10
           mean length:               10
+
+
+Test evolving renames
+
+  $ hg up null
+  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+  $ echo a > a
+  $ hg ci -Am a
+  adding a
+  created new head
+  $ echo b > b
+  $ hg ci -Am b
+  adding b
+  $ hg mv a c
+  $ hg ci -m c
+  $ hg kill .^
+  1 changesets pruned
+  1 new unstable changesets
+  $ hg stab --any
+  move:[15] c
+  atop:[13] a
+  $ hg st -C --change=tip
+  A c
+    a
+  R a
diff -r 24f59f38a202 -r c17ab719da56 tests/test-prune.t