Mercurial > evolve
comparison tests/test-evolve-progress.t @ 5112:51e38bf936cf
tests: adjust test output for an early return in mergecopies()
CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 02 Feb 2020 15:51:10 +0700 |
| parents | f162cafc5000 |
| children | c7aac40c85ff |
comparison
equal
deleted
inserted
replaced
| 5111:1fe3f7ffb462 | 5112:51e38bf936cf |
|---|---|
| 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 | |
| 47 resolving manifests | 45 resolving manifests |
| 48 branchmerge: True, force: True, partial: False | 46 branchmerge: True, force: True, partial: False |
| 49 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 | 47 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
| 50 b: remote created -> g | 48 b: remote created -> g |
| 51 getting b | 49 getting b |
| 152 obscache is out of date | 150 obscache is out of date |
| 153 move:[6] third | 151 move:[6] third |
| 154 atop:[11] second | 152 atop:[11] second |
| 155 hg rebase -r 53c0008d98a0 -d 60a86497fbfe | 153 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
| 156 evolve: 2/3 changesets (66.67%) | 154 evolve: 2/3 changesets (66.67%) |
| 157 unmatched files in other: | |
| 158 b | |
| 159 resolving manifests | 155 resolving manifests |
| 160 branchmerge: True, force: True, partial: False | 156 branchmerge: True, force: True, partial: False |
| 161 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 | 157 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
| 162 b: remote created -> g | 158 b: remote created -> g |
| 163 getting b | 159 getting b |