Mercurial > evolve
comparison tests/test-evolve-progress.t @ 6184:b8a1743e7ff9 mercurial-5.3
test-compat: merge mercurial-5.4 into mercurial-5.3
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:57:39 +0300 |
| parents | 1567b50fa006 6ce036cb7fd4 |
| children | df8df57a3ce3 270223576b7f |
comparison
equal
deleted
inserted
replaced
| 6183:9cb94967890b | 6184:b8a1743e7ff9 |
|---|---|
| 31 resolving manifests | 31 resolving manifests |
| 32 branchmerge: True, force: True, partial: False | 32 branchmerge: True, force: True, partial: False |
| 33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 | 33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
| 34 a: remote is newer -> g | 34 a: remote is newer -> g |
| 35 getting a | 35 getting a |
| 36 updating: a 1/2 files (50.00%) | 36 updating: a 1/1 files (100.00%) |
| 37 committing files: | 37 committing files: |
| 38 a | 38 a |
| 39 committing manifest | 39 committing manifest |
| 40 committing changelog | 40 committing changelog |
| 41 evolve: 2/3 changesets (66.67%) | 41 evolve: 2/3 changesets (66.67%) |
| 42 move:[2] third | 42 move:[2] third |
| 43 hg rebase -r 769574b07a96 -d 5f16d91ecde0 | 43 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
| 44 evolve: 2/3 changesets (66.67%) | 44 evolve: 2/3 changesets (66.67%) |
| 45 unmatched files in other: | |
| 46 b | |
| 45 resolving manifests | 47 resolving manifests |
| 46 branchmerge: True, force: True, partial: False | 48 branchmerge: True, force: True, partial: False |
| 47 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 | 49 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
| 48 b: remote created -> g | 50 b: remote created -> g |
| 49 getting b | 51 getting b |
| 59 resolving manifests | 61 resolving manifests |
| 60 branchmerge: True, force: True, partial: False | 62 branchmerge: True, force: True, partial: False |
| 61 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab | 63 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
| 62 b: remote is newer -> g | 64 b: remote is newer -> g |
| 63 getting b | 65 getting b |
| 64 updating: b 1/2 files (50.00%) | 66 updating: b 1/1 files (100.00%) |
| 65 committing files: | 67 committing files: |
| 66 b | 68 b |
| 67 committing manifest | 69 committing manifest |
| 68 committing changelog | 70 committing changelog |
| 69 updating the branch cache | 71 updating the branch cache |
| 92 resolving manifests | 94 resolving manifests |
| 93 branchmerge: True, force: True, partial: False | 95 branchmerge: True, force: True, partial: False |
| 94 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 | 96 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
| 95 a: remote is newer -> g | 97 a: remote is newer -> g |
| 96 getting a | 98 getting a |
| 97 updating: a 1/2 files (50.00%) | 99 updating: a 1/1 files (100.00%) |
| 98 committing files: | 100 committing files: |
| 99 a | 101 a |
| 100 committing manifest | 102 committing manifest |
| 101 committing changelog | 103 committing changelog |
| 102 updating the branch cache | 104 updating the branch cache |
| 151 obscache is out of date | 153 obscache is out of date |
| 152 move:[6] third | 154 move:[6] third |
| 153 atop:[11] second | 155 atop:[11] second |
| 154 hg rebase -r 53c0008d98a0 -d 60a86497fbfe | 156 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
| 155 evolve: 2/3 changesets (66.67%) | 157 evolve: 2/3 changesets (66.67%) |
| 158 unmatched files in other: | |
| 159 b | |
| 156 resolving manifests | 160 resolving manifests |
| 157 branchmerge: True, force: True, partial: False | 161 branchmerge: True, force: True, partial: False |
| 158 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 | 162 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
| 159 b: remote created -> g | 163 b: remote created -> g |
| 160 getting b | 164 getting b |
| 169 resolving manifests | 173 resolving manifests |
| 170 branchmerge: True, force: True, partial: False | 174 branchmerge: True, force: True, partial: False |
| 171 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 | 175 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
| 172 b: remote is newer -> g | 176 b: remote is newer -> g |
| 173 getting b | 177 getting b |
| 174 updating: b 1/2 files (50.00%) | 178 updating: b 1/1 files (100.00%) |
| 175 committing files: | 179 committing files: |
| 176 b | 180 b |
| 177 committing manifest | 181 committing manifest |
| 178 committing changelog | 182 committing changelog |
| 179 updating the branch cache | 183 updating the branch cache |