Mercurial > evolve

comparison tests/test-evolve-progress.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents e6ae5af97683 9a41c3c293ae
children e5bd76f95145
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
149 committing changelog 149 committing changelog
150 updating the branch cache 150 updating the branch cache
151 obscache is out of date 151 obscache is out of date
152 move:[6] third 152 move:[6] third
153 atop:[11] second 153 atop:[11] second
154 hg rebase -r 53c0008d98a0 -d 60a86497fbfe 154 hg rebase -r 53c0008d98a0 -d c8caf623f57b
155 evolve: 2/3 changesets (66.67%) 155 evolve: 2/3 changesets (66.67%)
156 resolving manifests 156 resolving manifests
157 branchmerge: True, force: True, partial: False 157 branchmerge: True, force: True, partial: False
158 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 158 ancestor: 5f16d91ecde0, local: c8caf623f57b+, remote: 53c0008d98a0
159 b: remote created -> g 159 b: remote created -> g
160 getting b 160 getting b
161 updating: b 1/1 files (100.00%) 161 updating: b 1/1 files (100.00%)
162 committing files: 162 committing files:
163 b 163 b
164 committing manifest 164 committing manifest
165 committing changelog 165 committing changelog
166 move:[7] fourth 166 move:[7] fourth
167 hg rebase -r 385376d04062 -d b2de95304e32 167 hg rebase -r 385376d04062 -d 55f7ff45dec4
168 evolve: 3/3 changesets (100.00%) 168 evolve: 3/3 changesets (100.00%)
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: 55f7ff45dec4+, 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/1 files (100.00%)
175 committing files: 175 committing files:
176 b 176 b
179 updating the branch cache 179 updating the branch cache
180 obscache is out of date 180 obscache is out of date
181 invalid branch cache (served): tip differs 181 invalid branch cache (served): tip differs
182 resolving manifests 182 resolving manifests
183 branchmerge: False, force: False, partial: False 183 branchmerge: False, force: False, partial: False
184 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 184 ancestor: 1edc3bac9e3c, local: 1edc3bac9e3c+, remote: f8d7d38c0a88
185 b: other deleted -> r 185 b: other deleted -> r
186 removing b 186 removing b
187 updating: b 1/2 files (50.00%) 187 updating: b 1/2 files (50.00%)
188 a: remote is newer -> g 188 a: remote is newer -> g
189 getting a 189 getting a