Mercurial > evolve
changeset 907:c17ab719da56
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 22 Apr 2014 17:04:40 -0700 |
| parents | 24f59f38a202 (current diff) 69872cef6053 (diff) |
| children | 06100fbc05e5 |
| files | hgext/evolve.py tests/test-evolve.t tests/test-prune.t |
| diffstat | 2 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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