Mercurial > evolve
diff tests/test-evolve-progress.t @ 4780:f1af4909c6dc mercurial-5.0
test-compat: merge stable into mercurial-5.0
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 14:42:57 +0200 |
| parents | d93fef4b98df |
| children | 5ad6d92f125c e5fe3ca5e6ad |
line wrap: on
line diff
--- a/tests/test-evolve-progress.t Mon Jul 29 14:42:49 2019 +0200 +++ b/tests/test-evolve-progress.t Mon Jul 29 14:42:57 2019 +0200 @@ -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 @@ -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