Mercurial > evolve
comparison tests/test-evolve-progress.t @ 6182:1567b50fa006 mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:37:29 +0300 |
| parents | 552efcc2cc30 |
| children | b8a1743e7ff9 e5bd76f95145 |
comparison
equal
deleted
inserted
replaced
| 6181:e6ae5af97683 | 6182:1567b50fa006 |
|---|---|
| 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/1 files (100.00%) | 36 updating: a 1/2 files (50.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%) |
| 59 resolving manifests | 59 resolving manifests |
| 60 branchmerge: True, force: True, partial: False | 60 branchmerge: True, force: True, partial: False |
| 61 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab | 61 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
| 62 b: remote is newer -> g | 62 b: remote is newer -> g |
| 63 getting b | 63 getting b |
| 64 updating: b 1/1 files (100.00%) | 64 updating: b 1/2 files (50.00%) |
| 65 committing files: | 65 committing files: |
| 66 b | 66 b |
| 67 committing manifest | 67 committing manifest |
| 68 committing changelog | 68 committing changelog |
| 69 updating the branch cache | 69 updating the branch cache |
| 92 resolving manifests | 92 resolving manifests |
| 93 branchmerge: True, force: True, partial: False | 93 branchmerge: True, force: True, partial: False |
| 94 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 | 94 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
| 95 a: remote is newer -> g | 95 a: remote is newer -> g |
| 96 getting a | 96 getting a |
| 97 updating: a 1/1 files (100.00%) | 97 updating: a 1/2 files (50.00%) |
| 98 committing files: | 98 committing files: |
| 99 a | 99 a |
| 100 committing manifest | 100 committing manifest |
| 101 committing changelog | 101 committing changelog |
| 102 updating the branch cache | 102 updating the branch cache |
| 169 resolving manifests | 169 resolving manifests |
| 170 branchmerge: True, force: True, partial: False | 170 branchmerge: True, force: True, partial: False |
| 171 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 | 171 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
| 172 b: remote is newer -> g | 172 b: remote is newer -> g |
| 173 getting b | 173 getting b |
| 174 updating: b 1/1 files (100.00%) | 174 updating: b 1/2 files (50.00%) |
| 175 committing files: | 175 committing files: |
| 176 b | 176 b |
| 177 committing manifest | 177 committing manifest |
| 178 committing changelog | 178 committing changelog |
| 179 updating the branch cache | 179 updating the branch cache |