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-phase-divergence.t
changeset 4660 b62ed7c69561
parent 4607 d314deb12f08
child 4672 653c42af172e
child 4676 b6c819facbe8 
--- a/tests/test-evolve-phase-divergence.t	Sat Jun 01 02:30:14 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Tue Jun 04 11:08:44 2019 +0200
@@ -199,7 +199,7 @@
 XXX: evolve should have mentioned that draft commit is just obsoleted in favour
 of public one. From the message it looks like a new commit is created.
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[2] tweak a
   atop:[1] modify a
   no changes to commit
@@ -315,7 +315,7 @@
 XXX: we should document what should user expect where running this, writing this
 test I have to go through code base to understand what will be the behavior
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[4] added bar to foo
   atop:[3] added foo to foo
   committed as 3d62500c673d
@@ -468,7 +468,7 @@
 Resolving the new phase-divergence changeset using `hg evolve`
 ---------------------------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[7] foo to bar
   atop:[6] added bar to bar
   committed as 502e73736632
@@ -604,7 +604,7 @@
 Using `hg evolve` to resolve phase-divergence
 ---------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[10] added x to x
   atop:[9] added x to x
   rebasing to destination parent: 502e73736632
@@ -725,7 +725,7 @@
 Resolving divergence using `hg evolve`
 -------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[14] y to y and foobar to foo
   atop:[12] y to y and foobar to foo
   rebasing to destination parent: 2352021b3785
@@ -801,7 +801,7 @@
 Resolution using `hg evolve --phase-divergent`
 ----------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[19] added l to l
   atop:[17] added l to l
   rebasing to destination parent: 8c2bb6fb44e9
@@ -931,14 +931,14 @@
   atop:[23] added g
   rebasing to destination parent: 21ae52e414e6
   no changes to commit
-  working directory is now at 428f7900a969
+  working directory is now at e3090241a10c
 
   $ hg glog -r f3794e5a91dc::
-  @  23:428f7900a969 added g
+  o  23:428f7900a969 added g
   |   () public
   o  22:21ae52e414e6 added f
   |   () public
-  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
   |   () public
   o  17:f3794e5a91dc added l to l
   |   () public
@@ -997,7 +997,6 @@
   recreate:[2] added m
   atop:[1] added m and n
   committed as 86419909e017
-  1 new orphan changesets
   recreate:[3] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
@@ -1258,7 +1257,6 @@
   recreate:[2] added m
   atop:[1] added m and n
   committed as 86419909e017
-  1 new orphan changesets
   recreate:[4] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
evolve