--- a/tests/test-evolve-obshistory-amend.t Wed Apr 08 01:02:23 2020 +0800
+++ b/tests/test-evolve-obshistory-amend.t Wed Apr 08 01:16:51 2020 +0800
@@ -94,7 +94,7 @@
4ae3a4151de9 (2) A1
471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -103,7 +103,7 @@
+A1
+
+Better commit message
-
+
diff -r 471f378eab4c -r 4ae3a4151de9 A0
--- a/A0 Thu Jan 01 00:00:00 1970 +0000
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000
@@ -244,7 +244,7 @@
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
@@ -252,7 +252,7 @@
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
@@ -455,15 +455,15 @@
92210308515b (2) A3
4f1685185907
- reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
@@ -471,14 +471,14 @@
92210308515b (2) A3
4f1685185907
- reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ reworded(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ reworded(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
--- a/tests/test-evolve-obshistory-split.t Wed Apr 08 01:02:23 2020 +0800
+++ b/tests/test-evolve-obshistory-split.t Wed Apr 08 01:16:51 2020 +0800
@@ -247,7 +247,7 @@
471597cad322
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
- note: testing split
+ note: testing split
(No patch available, context is not local)
@@ -256,6 +256,6 @@
471597cad322
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
- note: testing split
+ note: testing split
(No patch available, context is not local)
--- a/tests/test-evolve-orphan-merge.t Wed Apr 08 01:02:23 2020 +0800
+++ b/tests/test-evolve-orphan-merge.t Wed Apr 08 01:16:51 2020 +0800
@@ -521,16 +521,21 @@
$ hg evolve -r .
move:[28] merged l and x
atop:[0] added hgignore
- evolution of 28:fb8fe870ae7d created no changes to commit
- working directory is now at 8fa14d15e168
+ working directory is now at b61ba77b924a
$ hg glog
- @ 0:8fa14d15e168 added hgignore
+ @ 29:b61ba77b924a merged l and x
+ | () draft
+ o 0:8fa14d15e168 added hgignore
() draft
7) When one parent is pruned without successor and has no parent
----------------------------------------------------------------
+ $ hg prune -r .
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory is now at 8fa14d15e168
+ 1 changesets pruned
$ hg up null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -544,9 +549,9 @@
(branch merge, don't forget to commit)
$ hg ci -m "merge commit"
$ hg glog
- @ 30:32beb84b9dbc merge commit
+ @ 31:32beb84b9dbc merge commit
|\ () draft
- | o 29:f3ba8b99bb6f added foo
+ | o 30:f3ba8b99bb6f added foo
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -556,9 +561,9 @@
1 new orphan changesets
$ hg glog
- @ 30:32beb84b9dbc merge commit
+ @ 31:32beb84b9dbc merge commit
|\ () draft
- | x 29:f3ba8b99bb6f added foo
+ | x 30:f3ba8b99bb6f added foo
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -576,12 +581,12 @@
just remove that chain.
$ hg evolve -r .
- move:[30] merge commit
+ move:[31] merge commit
atop:[-1]
working directory is now at d2a03dd8c951
$ hg glog
- @ 31:d2a03dd8c951 merge commit
+ @ 32:d2a03dd8c951 merge commit
| () draft
o 0:8fa14d15e168 added hgignore
() draft