--- a/tests/test-evolve-progress.t Fri Feb 28 23:10:48 2020 +0700
+++ b/tests/test-evolve-progress.t Fri Feb 28 23:18:48 2020 +0700
@@ -28,6 +28,7 @@
atop:[4] first v2
hg rebase -r 4f60c78b6d58 -d fd0a2402f834
evolve: 1/3 changesets (33.33%)
+ searching for copies back to rev 0
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
@@ -42,7 +43,10 @@
move:[2] third
hg rebase -r 769574b07a96 -d 5f16d91ecde0
evolve: 2/3 changesets (66.67%)
- unmatched files in other:
+ searching for copies back to rev 0
+ unmatched files in other (from base):
+ b
+ unmatched files in other (from topological common ancestor):
b
resolving manifests
branchmerge: True, force: True, partial: False
@@ -58,6 +62,7 @@
move:[3] fourth
hg rebase -r 22782fddc0ab -d 53c0008d98a0
evolve: 3/3 changesets (100.00%)
+ searching for copies back to rev 0
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
@@ -70,7 +75,7 @@
committing changelog
updating the branch cache
obscache is out of date
- invalid branch cache (served): tip differs
+ invalid branchheads cache (served): tip differs
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834
@@ -91,6 +96,7 @@
atop:[8] first v3
hg rebase -r 5f16d91ecde0 -d 152c368c622b
evolve: 1/1 changesets (100.00%)
+ searching for copies back to rev 4
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
@@ -121,6 +127,7 @@
atop:[10] first v4
hg rebase -r df5d742141b0 -d f8d7d38c0a88
evolve: 1/3 changesets (33.33%)
+ searching for copies back to rev 8
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
@@ -154,7 +161,10 @@
atop:[11] second
hg rebase -r 53c0008d98a0 -d 60a86497fbfe
evolve: 2/3 changesets (66.67%)
- unmatched files in other:
+ searching for copies back to rev 4
+ unmatched files in other (from base):
+ b
+ unmatched files in other (from topological common ancestor):
b
resolving manifests
branchmerge: True, force: True, partial: False
@@ -169,6 +179,7 @@
move:[7] fourth
hg rebase -r 385376d04062 -d b2de95304e32
evolve: 3/3 changesets (100.00%)
+ searching for copies back to rev 4
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
@@ -181,7 +192,7 @@
committing changelog
updating the branch cache
obscache is out of date
- invalid branch cache (served): tip differs
+ invalid branchheads cache (served): tip differs
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88