Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 6065:c0921b5277a0 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 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents fd039a7f0c3c 1cbafebe874b
children e82ad19eb3cc 1328195f76a9
comparison
equal deleted inserted replaced
6064:28a77df6e41f 6065:c0921b5277a0
88 merging d 88 merging d
89 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 89 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
90 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 90 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
91 unresolved merge conflicts 91 unresolved merge conflicts
92 (see 'hg help evolve.interrupted') 92 (see 'hg help evolve.interrupted')
93 [240] 93 [1]
94 94
95 $ hg status -v 95 $ hg status -v
96 M d 96 M d
97 # The repository is in an unfinished *evolve* state. 97 # The repository is in an unfinished *evolve* state.
98 98
202 merging d 202 merging d
203 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 203 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
205 unresolved merge conflicts 205 unresolved merge conflicts
206 (see 'hg help evolve.interrupted') 206 (see 'hg help evolve.interrupted')
207 [240] 207 [1]
208 208
209 $ hg evolve --abort 209 $ hg evolve --abort
210 2 new orphan changesets 210 2 new orphan changesets
211 2 new content-divergent changesets 211 2 new content-divergent changesets
212 evolve aborted 212 evolve aborted
277 $ echo foo > d 277 $ echo foo > d
278 $ hg add d 278 $ hg add d
279 $ hg ci -m "added d" 279 $ hg ci -m "added d"
280 280
281 $ hg rebase -r . -d .^^^ --config extensions.rebase= 281 $ hg rebase -r . -d .^^^ --config extensions.rebase=
282 rebasing 5:f8b09dd867e5 tip "added d" 282 rebasing 5:f8b09dd867e5 "added d" (tip)
283 $ echo bar > c 283 $ echo bar > c
284 $ hg add c 284 $ hg add c
285 $ hg amend 285 $ hg amend
286 286
287 $ hg up --hidden 'min(desc("added d"))' 287 $ hg up --hidden 'min(desc("added d"))'
316 rebasing "other" content-divergent changeset a8673909e314 on c7586e2a9264 316 rebasing "other" content-divergent changeset a8673909e314 on c7586e2a9264
317 merging a 317 merging a
318 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 318 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
319 unresolved merge conflicts 319 unresolved merge conflicts
320 (see 'hg help evolve.interrupted') 320 (see 'hg help evolve.interrupted')
321 [240] 321 [1]
322 322
323 $ hg evolve --abort 323 $ hg evolve --abort
324 evolve aborted 324 evolve aborted
325 working directory is now at a8673909e314 325 working directory is now at a8673909e314
326 326
369 rebasing "divergent" content-divergent changeset a8673909e314 on c7586e2a9264 369 rebasing "divergent" content-divergent changeset a8673909e314 on c7586e2a9264
370 merging a 370 merging a
371 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 371 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
372 unresolved merge conflicts 372 unresolved merge conflicts
373 (see 'hg help evolve.interrupted') 373 (see 'hg help evolve.interrupted')
374 [240] 374 [1]
375 375
376 this test case is mainly to test that we hit merge conlict while merging the 376 this test case is mainly to test that we hit merge conlict while merging the
377 two divergent csets, so resolving this one which happened during relocation 377 two divergent csets, so resolving this one which happened during relocation
378 $ echo a > a 378 $ echo a > a
379 $ hg resolve -m 379 $ hg resolve -m
387 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 387 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
388 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 388 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
389 0 files updated, 0 files merged, 0 files removed, 2 files unresolved 389 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
390 unresolved merge conflicts 390 unresolved merge conflicts
391 (see 'hg help evolve.interrupted') 391 (see 'hg help evolve.interrupted')
392 [240] 392 [1]
393 393
394 $ hg evolve --abort 394 $ hg evolve --abort
395 evolve aborted 395 evolve aborted
396 working directory is now at b6a3f3ee0c44 396 working directory is now at b6a3f3ee0c44
397 397
479 merging d 479 merging d
480 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 480 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
481 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 481 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
482 unresolved merge conflicts 482 unresolved merge conflicts
483 (see 'hg help evolve.interrupted') 483 (see 'hg help evolve.interrupted')
484 [240] 484 [1]
485 485
486 $ hg evolve --stop 486 $ hg evolve --stop
487 stopped the interrupted evolve 487 stopped the interrupted evolve
488 working directory is now at 9c1631e352d9 488 working directory is now at 9c1631e352d9
489 489
506 Content divergence with parent change which will result in conflicts while 506 Content divergence with parent change which will result in conflicts while
507 merging 507 merging
508 --------------------------------------------------------------------------- 508 ---------------------------------------------------------------------------
509 509
510 $ hg rebase -r . -d .^^^ --config extensions.rebase= 510 $ hg rebase -r . -d .^^^ --config extensions.rebase=
511 rebasing 6:9c1631e352d9 tip "added d" 511 rebasing 6:9c1631e352d9 "added d" (tip)
512 512
513 $ hg glog 513 $ hg glog
514 @ 7:517d4375cb72 added d 514 @ 7:517d4375cb72 added d
515 | () draft content-divergent 515 | () draft content-divergent
516 | * 5:e49523854bc8 added d 516 | * 5:e49523854bc8 added d
532 merging d 532 merging d
533 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 533 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
534 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 534 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
535 unresolved merge conflicts 535 unresolved merge conflicts
536 (see 'hg help evolve.interrupted') 536 (see 'hg help evolve.interrupted')
537 [240] 537 [1]
538 538
539 $ hg evolve --stop 539 $ hg evolve --stop
540 stopped the interrupted evolve 540 stopped the interrupted evolve
541 working directory is now at 517d4375cb72 541 working directory is now at 517d4375cb72
542 542
591 rebasing "other" content-divergent changeset 0892835a581f on c7586e2a9264 591 rebasing "other" content-divergent changeset 0892835a581f on c7586e2a9264
592 merging a 592 merging a
593 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 593 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
594 unresolved merge conflicts 594 unresolved merge conflicts
595 (see 'hg help evolve.interrupted') 595 (see 'hg help evolve.interrupted')
596 [240] 596 [1]
597 597
598 $ hg diff 598 $ hg diff
599 diff -r c7586e2a9264 a 599 diff -r c7586e2a9264 a
600 --- a/a Thu Jan 01 00:00:00 1970 +0000 600 --- a/a Thu Jan 01 00:00:00 1970 +0000
601 +++ b/a Thu Jan 01 00:00:00 1970 +0000 601 +++ b/a Thu Jan 01 00:00:00 1970 +0000