Mercurial > evolve
comparison tests/test-evolve-progress.t @ 6187:df8df57a3ce3 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 18:21:24 +0300 |
| parents | b8a1743e7ff9 c2c85576ddfb |
| children | 4c0d0be7cf95 716912541759 |
comparison
equal
deleted
inserted
replaced
| 6186:c915d9441654 | 6187:df8df57a3ce3 |
|---|---|
| 26 evolve: 1/3 changesets (33.33%) | 26 evolve: 1/3 changesets (33.33%) |
| 27 move:[1] second | 27 move:[1] second |
| 28 atop:[4] first v2 | 28 atop:[4] first v2 |
| 29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 | 29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
| 30 evolve: 1/3 changesets (33.33%) | 30 evolve: 1/3 changesets (33.33%) |
| 31 searching for copies back to rev 0 | |
| 31 resolving manifests | 32 resolving manifests |
| 32 branchmerge: True, force: True, partial: False | 33 branchmerge: True, force: True, partial: False |
| 33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 | 34 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
| 34 a: remote is newer -> g | 35 a: remote is newer -> g |
| 35 getting a | 36 getting a |
| 40 committing changelog | 41 committing changelog |
| 41 evolve: 2/3 changesets (66.67%) | 42 evolve: 2/3 changesets (66.67%) |
| 42 move:[2] third | 43 move:[2] third |
| 43 hg rebase -r 769574b07a96 -d 5f16d91ecde0 | 44 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
| 44 evolve: 2/3 changesets (66.67%) | 45 evolve: 2/3 changesets (66.67%) |
| 45 unmatched files in other: | 46 searching for copies back to rev 0 |
| 47 unmatched files in other (from base): | |
| 48 b | |
| 49 unmatched files in other (from topological common ancestor): | |
| 46 b | 50 b |
| 47 resolving manifests | 51 resolving manifests |
| 48 branchmerge: True, force: True, partial: False | 52 branchmerge: True, force: True, partial: False |
| 49 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 | 53 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
| 50 b: remote created -> g | 54 b: remote created -> g |
| 56 committing changelog | 60 committing changelog |
| 57 evolve: 3/3 changesets (100.00%) | 61 evolve: 3/3 changesets (100.00%) |
| 58 move:[3] fourth | 62 move:[3] fourth |
| 59 hg rebase -r 22782fddc0ab -d 53c0008d98a0 | 63 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
| 60 evolve: 3/3 changesets (100.00%) | 64 evolve: 3/3 changesets (100.00%) |
| 65 searching for copies back to rev 0 | |
| 61 resolving manifests | 66 resolving manifests |
| 62 branchmerge: True, force: True, partial: False | 67 branchmerge: True, force: True, partial: False |
| 63 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab | 68 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
| 64 b: remote is newer -> g | 69 b: remote is newer -> g |
| 65 getting b | 70 getting b |
| 68 b | 73 b |
| 69 committing manifest | 74 committing manifest |
| 70 committing changelog | 75 committing changelog |
| 71 updating the branch cache | 76 updating the branch cache |
| 72 obscache is out of date | 77 obscache is out of date |
| 73 invalid branch cache (served): tip differs | 78 invalid branchheads cache (served): tip differs |
| 74 resolving manifests | 79 resolving manifests |
| 75 branchmerge: False, force: False, partial: False | 80 branchmerge: False, force: False, partial: False |
| 76 ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 | 81 ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 |
| 77 b: other deleted -> r | 82 b: other deleted -> r |
| 78 removing b | 83 removing b |
| 89 evolve: 1/1 changesets (100.00%) | 94 evolve: 1/1 changesets (100.00%) |
| 90 move:[5] second | 95 move:[5] second |
| 91 atop:[8] first v3 | 96 atop:[8] first v3 |
| 92 hg rebase -r 5f16d91ecde0 -d 152c368c622b | 97 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
| 93 evolve: 1/1 changesets (100.00%) | 98 evolve: 1/1 changesets (100.00%) |
| 99 searching for copies back to rev 4 | |
| 94 resolving manifests | 100 resolving manifests |
| 95 branchmerge: True, force: True, partial: False | 101 branchmerge: True, force: True, partial: False |
| 96 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 | 102 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
| 97 a: remote is newer -> g | 103 a: remote is newer -> g |
| 98 getting a | 104 getting a |
| 119 evolve: 1/3 changesets (33.33%) | 125 evolve: 1/3 changesets (33.33%) |
| 120 move:[9] second | 126 move:[9] second |
| 121 atop:[10] first v4 | 127 atop:[10] first v4 |
| 122 hg rebase -r df5d742141b0 -d f8d7d38c0a88 | 128 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
| 123 evolve: 1/3 changesets (33.33%) | 129 evolve: 1/3 changesets (33.33%) |
| 130 searching for copies back to rev 8 | |
| 124 resolving manifests | 131 resolving manifests |
| 125 branchmerge: True, force: True, partial: False | 132 branchmerge: True, force: True, partial: False |
| 126 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 | 133 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
| 127 starting 4 threads for background file closing (?) | 134 starting 4 threads for background file closing (?) |
| 128 preserving a for resolve of a | 135 preserving a for resolve of a |
| 153 obscache is out of date | 160 obscache is out of date |
| 154 move:[6] third | 161 move:[6] third |
| 155 atop:[11] second | 162 atop:[11] second |
| 156 hg rebase -r 53c0008d98a0 -d 60a86497fbfe | 163 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
| 157 evolve: 2/3 changesets (66.67%) | 164 evolve: 2/3 changesets (66.67%) |
| 158 unmatched files in other: | 165 searching for copies back to rev 4 |
| 166 unmatched files in other (from base): | |
| 167 b | |
| 168 unmatched files in other (from topological common ancestor): | |
| 159 b | 169 b |
| 160 resolving manifests | 170 resolving manifests |
| 161 branchmerge: True, force: True, partial: False | 171 branchmerge: True, force: True, partial: False |
| 162 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 | 172 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
| 163 b: remote created -> g | 173 b: remote created -> g |
| 168 committing manifest | 178 committing manifest |
| 169 committing changelog | 179 committing changelog |
| 170 move:[7] fourth | 180 move:[7] fourth |
| 171 hg rebase -r 385376d04062 -d b2de95304e32 | 181 hg rebase -r 385376d04062 -d b2de95304e32 |
| 172 evolve: 3/3 changesets (100.00%) | 182 evolve: 3/3 changesets (100.00%) |
| 183 searching for copies back to rev 4 | |
| 173 resolving manifests | 184 resolving manifests |
| 174 branchmerge: True, force: True, partial: False | 185 branchmerge: True, force: True, partial: False |
| 175 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 | 186 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
| 176 b: remote is newer -> g | 187 b: remote is newer -> g |
| 177 getting b | 188 getting b |
| 180 b | 191 b |
| 181 committing manifest | 192 committing manifest |
| 182 committing changelog | 193 committing changelog |
| 183 updating the branch cache | 194 updating the branch cache |
| 184 obscache is out of date | 195 obscache is out of date |
| 185 invalid branch cache (served): tip differs | 196 invalid branchheads cache (served): tip differs |
| 186 resolving manifests | 197 resolving manifests |
| 187 branchmerge: False, force: False, partial: False | 198 branchmerge: False, force: False, partial: False |
| 188 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 | 199 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 |
| 189 b: other deleted -> r | 200 b: other deleted -> r |
| 190 removing b | 201 removing b |