Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergent-relocation.t
branchmercurial-4.6
changeset 4513 d70db7e455dc
parent 4512 7a779a288793
child 4516 f54bb6eaf5e6
child 4673 3ef4980353af 
--- a/tests/test-evolve-content-divergent-relocation.t	Thu Apr 11 22:41:41 2019 +0200
+++ b/tests/test-evolve-content-divergent-relocation.t	Thu Apr 11 22:42:13 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
 ------------------------------------------------------------------------------
@@ -140,9 +139,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
@@ -225,9 +224,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
@@ -360,9 +359,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
evolve