##// END OF EJS Templates
tests: show that in-mem rebase falling back loses state...
Martin von Zweigbergk -
r40834:8ff910b2 stable
parent child Browse files
Show More
@@ -1,5 +1,7 b''
1 #require symlink execbit
1 #require symlink execbit
2 $ cat << EOF >> $HGRCPATH
2 $ cat << EOF >> $HGRCPATH
3 > [phases]
4 > publish=False
3 > [extensions]
5 > [extensions]
4 > amend=
6 > amend=
5 > rebase=
7 > rebase=
@@ -428,6 +430,58 b' In-memory rebase that fails due to merge'
428 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
430 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
429 unresolved conflicts (see hg resolve, then hg rebase --continue)
431 unresolved conflicts (see hg resolve, then hg rebase --continue)
430 [1]
432 [1]
433 $ hg rebase --abort
434 saved backup bundle to $TESTTMP/repo1/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
435 rebase aborted
436
437 Retrying without in-memory merge won't lose working copy changes
438 $ cd ..
439 $ hg clone repo3 repo3-dirty -q
440 $ cd repo3-dirty
441 $ echo dirty > a
442 $ hg rebase -s 2 -d 7
443 rebasing 2:177f92b77385 "c"
444 rebasing 3:055a42cdd887 "d"
445 rebasing 4:e860deea161a "e"
446 merging e
447 transaction abort!
448 rollback completed
449 hit merge conflicts; re-running rebase without in-memory merge
450 rebase aborted
451 rebasing 2:177f92b77385 "c"
452 rebasing 3:055a42cdd887 "d"
453 rebasing 4:e860deea161a "e"
454 merging e
455 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
456 unresolved conflicts (see hg resolve, then hg rebase --continue)
457 [1]
458 BROKEN: working copy change to "a" was lost
459 $ cat a
460 a
461
462 Retrying without in-memory merge won't lose merge state
463 $ cd ..
464 $ hg clone repo3 repo3-merge-state -q
465 $ cd repo3-merge-state
466 $ hg merge 4
467 merging e
468 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
469 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
470 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
471 [1]
472 $ hg resolve -l
473 U e
474 BROKEN: these should not say "created no changes to commit"
475 $ hg rebase -s 2 -d 7
476 rebasing 2:177f92b77385 "c"
477 note: rebase of 2:177f92b77385 created no changes to commit
478 rebasing 3:055a42cdd887 "d"
479 note: rebase of 3:055a42cdd887 created no changes to commit
480 rebasing 4:e860deea161a "e"
481 note: rebase of 4:e860deea161a created no changes to commit
482 saved backup bundle to $TESTTMP/repo1/repo3-merge-state/.hg/strip-backup/177f92b77385-4da7ba9e-rebase.hg
483 BROKEN: merge state lost
484 $ hg resolve -l
431
485
432 ==========================
486 ==========================
433 Test for --confirm option|
487 Test for --confirm option|
General Comments 0
You need to be logged in to leave comments. Login now