Mercurial > evolve

comparison tests/test-evolve-stop-orphan.t @ 5828:0eacb0732195 mercurial-5.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.3 into mercurial-5.2 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 13:36:30 +0800
parents 9b1bdd68d545
children 1f301a3062f5 34f5c849fc1d
comparison
equal deleted inserted replaced
5761:f804b78e9ee5 5828:0eacb0732195
151 +foo 151 +foo
152 +>>>>>>> evolving: c41c793e0ef1 - test: added d 152 +>>>>>>> evolving: c41c793e0ef1 - test: added d
153 153
154 $ hg evolve --stop 154 $ hg evolve --stop
155 stopped the interrupted evolve 155 stopped the interrupted evolve
156 working directory is now at cb6a2ab625bb
157 156
158 $ hg glog 157 $ hg glog
159 @ 5:cb6a2ab625bb added c 158 @ 5:cb6a2ab625bb added c
160 | () draft 159 | () draft
161 | * 4:c41c793e0ef1 added d 160 | * 4:c41c793e0ef1 added d
256 M c 255 M c
257 A d 256 A d
258 257
259 $ hg evolve --stop 258 $ hg evolve --stop
260 stopped the interrupted evolve 259 stopped the interrupted evolve
261 working directory is now at aec285328e90 260 working directory is now at 21817cd42526
262 261
263 Only changeset which has a successor now are obsoleted 262 Only changeset which has a successor now are obsoleted
264 $ hg glog 263 $ hg glog
265 @ 9:aec285328e90 added b 264 o 9:aec285328e90 added b
266 | () draft 265 | () draft
267 o 8:fd00db71edca added a 266 o 8:fd00db71edca added a
268 | () draft 267 | () draft
269 o 7:21817cd42526 added hgignore 268 @ 7:21817cd42526 added hgignore
270 () draft 269 () draft
271 * 6:2a4e03d422e2 added d 270 * 6:2a4e03d422e2 added d
272 | () draft 271 | () draft
273 * 5:cb6a2ab625bb added c 272 * 5:cb6a2ab625bb added c
274 | () draft 273 | () draft
301 $ hg glog 300 $ hg glog
302 o 11:cd0909a30222 added d 301 o 11:cd0909a30222 added d
303 | () draft 302 | () draft
304 o 10:cb1dd1086ef6 added c 303 o 10:cb1dd1086ef6 added c
305 | () draft 304 | () draft
306 @ 9:aec285328e90 added b 305 o 9:aec285328e90 added b
307 | () draft 306 | () draft
308 o 8:fd00db71edca added a 307 o 8:fd00db71edca added a
309 | () draft 308 | () draft
310 o 7:21817cd42526 added hgignore 309 @ 7:21817cd42526 added hgignore
311 () draft 310 () draft
312 311
313 Bookmarks should only be moved of the changesets which have been evolved, 312 Bookmarks should only be moved of the changesets which have been evolved,
314 bookmarks of rest of them should stay where they are are 313 bookmarks of rest of them should stay where they are are
315 ------------------------------------------------------------------------- 314 -------------------------------------------------------------------------
316 315
317 $ hg up tip^ 316 $ hg up tip^
318 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 317 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
319 $ hg bookmark b1 318 $ hg bookmark b1
320 $ hg up .^ 319 $ hg up .^
321 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 320 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
322 (leaving bookmark b1) 321 (leaving bookmark b1)
323 $ hg bookmark b2 322 $ hg bookmark b2
365 (see 'hg help evolve.interrupted') 364 (see 'hg help evolve.interrupted')
366 [1] 365 [1]
367 366
368 $ hg evolve --stop 367 $ hg evolve --stop
369 stopped the interrupted evolve 368 stopped the interrupted evolve
370 working directory is now at a3f4b95da934 369 working directory is now at a3cc2042492f
371 370
372 Bookmarks of only the changeset which are evolved is moved 371 Bookmarks of only the changeset which are evolved is moved
373 $ hg glog 372 $ hg glog
374 @ 13:a3f4b95da934 added b 373 o 13:a3f4b95da934 added b
375 | (b2) draft 374 | (b2) draft
376 o 12:a3cc2042492f added a 375 @ 12:a3cc2042492f added a
377 | () draft 376 | () draft
378 | * 11:cd0909a30222 added d 377 | * 11:cd0909a30222 added d
379 | | () draft 378 | | () draft
380 | * 10:cb1dd1086ef6 added c 379 | * 10:cb1dd1086ef6 added c
381 | | (b1) draft 380 | | (b1) draft