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-issue5832.t
branchmercurial-4.4
changeset 4516 f54bb6eaf5e6
parent 4363 a2fdbece7ce1
parent 4393 159a4a6ded0b
child 4675 79bc0f1a832e 
--- a/tests/test-evolve-issue5832.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-issue5832.t	Thu Apr 11 22:44:53 2019 +0200
@@ -52,7 +52,6 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo foo > a
   $ hg amend
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -69,11 +68,11 @@
   |/    () draft
   | o  5:7014ec2829cd added a
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -90,11 +89,11 @@
   |/    () draft
   | o  5:7014ec2829cd added a
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -192,7 +191,6 @@
   $ hg ci -Aqm "added l"
   $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -212,11 +210,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -235,11 +233,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -337,7 +335,6 @@
   $ hg ci -Aqm "added l"
   $ hg pick -r 1b24879c5c3c
   picking 1:1b24879c5c3c "added a"
-  2 new orphan changesets
 
   $ hg up bde1d2b6b5e5
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -357,11 +354,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---o  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
@@ -380,11 +377,11 @@
   | |   () draft
   | o  5:0a6281e212fe added l
   |/    () draft
-  | *    4:b9b387427a53 merge commit
+  | o    4:b9b387427a53 merge commit
   | |\    () draft
   +---x  3:9402371b436e added c and d
   | |     () draft
-  | *  2:a1da0651488c added b
+  | o  2:a1da0651488c added b
   | |   () draft
   | x  1:1b24879c5c3c added a
   |/    () draft
evolve