Mercurial > evolve

comparison tests/test-evolve-progress.t @ 6398:270223576b7f mercurial-5.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.4 into mercurial-5.3
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 01:44:08 +0400
parents b8a1743e7ff9 e5bd76f95145
children 716912541759
comparison
equal deleted inserted replaced
6352:0bf00051bbc7 6398:270223576b7f
151 committing changelog 151 committing changelog
152 updating the branch cache 152 updating the branch cache
153 obscache is out of date 153 obscache is out of date
154 move:[6] third 154 move:[6] third
155 atop:[11] second 155 atop:[11] second
156 hg rebase -r 53c0008d98a0 -d 60a86497fbfe 156 hg rebase -r 53c0008d98a0 -d c8caf623f57b
157 evolve: 2/3 changesets (66.67%) 157 evolve: 2/3 changesets (66.67%)
158 unmatched files in other: 158 unmatched files in other:
159 b 159 b
160 resolving manifests 160 resolving manifests
161 branchmerge: True, force: True, partial: False 161 branchmerge: True, force: True, partial: False
162 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 162 ancestor: 5f16d91ecde0, local: c8caf623f57b+, remote: 53c0008d98a0
163 b: remote created -> g 163 b: remote created -> g
164 getting b 164 getting b
165 updating: b 1/1 files (100.00%) 165 updating: b 1/1 files (100.00%)
166 committing files: 166 committing files:
167 b 167 b
168 committing manifest 168 committing manifest
169 committing changelog 169 committing changelog
170 move:[7] fourth 170 move:[7] fourth
171 hg rebase -r 385376d04062 -d b2de95304e32 171 hg rebase -r 385376d04062 -d 55f7ff45dec4
172 evolve: 3/3 changesets (100.00%) 172 evolve: 3/3 changesets (100.00%)
173 resolving manifests 173 resolving manifests
174 branchmerge: True, force: True, partial: False 174 branchmerge: True, force: True, partial: False
175 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 175 ancestor: 53c0008d98a0, local: 55f7ff45dec4+, remote: 385376d04062
176 b: remote is newer -> g 176 b: remote is newer -> g
177 getting b 177 getting b
178 updating: b 1/1 files (100.00%) 178 updating: b 1/1 files (100.00%)
179 committing files: 179 committing files:
180 b 180 b
183 updating the branch cache 183 updating the branch cache
184 obscache is out of date 184 obscache is out of date
185 invalid branch cache (served): tip differs 185 invalid branch cache (served): tip differs
186 resolving manifests 186 resolving manifests
187 branchmerge: False, force: False, partial: False 187 branchmerge: False, force: False, partial: False
188 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 188 ancestor: 1edc3bac9e3c, local: 1edc3bac9e3c+, remote: f8d7d38c0a88
189 b: other deleted -> r 189 b: other deleted -> r
190 removing b 190 removing b
191 updating: b 1/2 files (50.00%) 191 updating: b 1/2 files (50.00%)
192 a: remote is newer -> g 192 a: remote is newer -> g
193 getting a 193 getting a