Mercurial > evolve
diff tests/test-evolve-content-divergent-relocation.t @ 4673:3ef4980353af mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 05 Jun 2019 17:45:45 +0200 |
| parents | 61c2518cd6d2 d70db7e455dc |
| children | 79bc0f1a832e ecf0f3bc7468 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-relocation.t Wed Jun 05 17:42:50 2019 +0200 +++ b/tests/test-evolve-content-divergent-relocation.t Wed Jun 05 17:45:45 2019 +0200 @@ -14,7 +14,6 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH - Testing resolution of content-divergent changesets when they are on different parents and resolution and relocation wont result in conflicts ------------------------------------------------------------------------------ @@ -135,9 +134,9 @@ $ hg amend -m "added foo to x" $ hg up 71a392c714b5 --hidden + updating to a hidden changeset 71a392c714b5 + (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 71a392c714b5 - (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) working directory parent is obsolete! (71a392c714b5) (use 'hg evolve' to update to its successor: 1e1a50385a7d) $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True @@ -218,9 +217,9 @@ $ hg amend $ hg up fc6ad2bac162 --hidden + updating to a hidden changeset fc6ad2bac162 + (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset fc6ad2bac162 - (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) working directory parent is obsolete! (fc6ad2bac162) (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True @@ -351,9 +350,9 @@ $ hg amend $ hg up daf1de08f3b0 --hidden + updating to a hidden changeset daf1de08f3b0 + (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - updated to hidden changeset daf1de08f3b0 - (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) working directory parent is obsolete! (daf1de08f3b0) (use 'hg evolve' to update to its successor: 3f7a1f693080) $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True