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 3623 71fbb679e311
parent 3621 db3ec5f79ab9
child 3624 6756f2a85f5b 
--- a/tests/test-evolve-phase-divergence.t	Fri Mar 23 17:21:09 2018 +0530
+++ b/tests/test-evolve-phase-divergence.t	Fri Mar 23 17:46:46 2018 +0530
@@ -603,18 +603,14 @@
   rebasing to destination parent: 502e73736632
   (leaving bookmark bm)
   computing new diff
-  committed as 5388376cb2f0
-  working directory is now at 5388376cb2f0
+  committed as 2352021b3785
+  working directory is now at 2352021b3785
 
-XXX: we should not have created a new commit here
+XXX: we should move bookmark here
   $ hg glog
-  @  12:5388376cb2f0 phase-divergent update to 2352021b3785:
-  |
-  |  added x to x
-  |   () draft
-  | x  11:b1a0e143e32b added x to x
-  | |   (bm) draft
-  o |  9:2352021b3785 added x to x
+  x  11:b1a0e143e32b added x to x
+  |   (bm) draft
+  | @  9:2352021b3785 added x to x
   |/    () public
   o  8:502e73736632 phase-divergent update to b756eb10ea73:
   |
@@ -633,32 +629,28 @@
   o  0:d3873e73d99e init
       () public
 
-  $ hg obslog -r .
-  @  5388376cb2f0 (12) phase-divergent update to 2352021b3785:
-  |
+  $ hg obslog -r . b1a0e143e32b --all --hidden
   x  b1a0e143e32b (11) added x to x
-  |    rewritten(description, parent, content) as 5388376cb2f0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  334e300d6db5 (10) added x to x
   |    rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  o  2352021b3785 (9) added x to x
+  @  2352021b3785 (9) added x to x
        rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
-XXX: The existence of this changeset is wrong, moreover its diff is wrong
+
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 5388376cb2f0f9bc4842361fb16fe66ce5cc2f6d
-  # Parent  2352021b37851be226ebed109b0eb6eada918566
-  phase-divergent update to 2352021b3785:
-  
+  # Node ID 2352021b37851be226ebed109b0eb6eada918566
+  # Parent  502e737366322886cf628276aa0a2796904453b4
   added x to x
   
-  diff -r 2352021b3785 -r 5388376cb2f0 bar
-  --- a/bar	Thu Jan 01 00:00:00 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +0,0 @@
-  -foo
+  diff -r 502e73736632 -r 2352021b3785 x
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +x
evolve