Show More
@@ -530,4 +530,133 b' unshelve should keep a copy of unknown f' | |||||
530 | $ cat e.orig |
|
530 | $ cat e.orig | |
531 | z |
|
531 | z | |
532 |
|
532 | |||
|
533 | ||||
|
534 | unshelve and conflicts with untracked files | |||
|
535 | ||||
|
536 | preparing: | |||
|
537 | ||||
|
538 | $ rm *.orig | |||
|
539 | $ hg ci -qm 'commit stuff' | |||
|
540 | $ hg phase -p null: | |||
|
541 | ||||
|
542 | no other changes - no merge: | |||
|
543 | ||||
|
544 | $ echo f > f | |||
|
545 | $ hg add f | |||
|
546 | $ hg shelve | |||
|
547 | shelved as default | |||
|
548 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
549 | $ echo gold > f | |||
|
550 | $ hg unshelve | |||
|
551 | unshelving change 'default' | |||
|
552 | $ hg st | |||
|
553 | A f | |||
|
554 | ? f.orig | |||
|
555 | $ cat f | |||
|
556 | f | |||
|
557 | $ cat f.orig | |||
|
558 | gold | |||
|
559 | ||||
|
560 | other uncommitted changes - merge: | |||
|
561 | ||||
|
562 | $ hg st | |||
|
563 | A f | |||
|
564 | ? f.orig | |||
|
565 | $ hg shelve | |||
|
566 | shelved as default | |||
|
567 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
568 | $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle:.hg/shelved/default.hg -r 'bundle()' | |||
|
569 | o 4 changes to 'commit stuff' shelve@localhost | |||
|
570 | | | |||
|
571 | $ hg log -G --template '{rev} {desc|firstline} {author}' | |||
|
572 | @ 3 commit stuff test | |||
|
573 | | | |||
|
574 | | o 2 c test | |||
|
575 | |/ | |||
|
576 | o 0 a test | |||
|
577 | ||||
|
578 | $ mv f.orig f | |||
|
579 | $ echo other change >> a | |||
|
580 | $ hg unshelve | |||
|
581 | unshelving change 'default' | |||
|
582 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |||
|
583 | rebasing shelved changes | |||
|
584 | merging f | |||
|
585 | warning: conflicts during merge. | |||
|
586 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |||
|
587 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | |||
|
588 | [1] | |||
|
589 | $ hg log -G --template '{rev} {desc|firstline} {author}' | |||
|
590 | @ 5 changes to 'commit stuff' shelve@localhost | |||
|
591 | | | |||
|
592 | | @ 4 pending changes temporary commit shelve@localhost | |||
|
593 | |/ | |||
|
594 | o 3 commit stuff test | |||
|
595 | | | |||
|
596 | | o 2 c test | |||
|
597 | |/ | |||
|
598 | o 0 a test | |||
|
599 | ||||
|
600 | $ hg st | |||
|
601 | M f | |||
|
602 | ? f.orig | |||
|
603 | $ cat f | |||
|
604 | <<<<<<< local | |||
|
605 | gold | |||
|
606 | ======= | |||
|
607 | f | |||
|
608 | >>>>>>> other | |||
|
609 | $ cat f.orig | |||
|
610 | gold | |||
|
611 | $ hg unshelve --abort | |||
|
612 | rebase aborted | |||
|
613 | unshelve of 'default' aborted | |||
|
614 | $ hg st | |||
|
615 | M a | |||
|
616 | ? f.orig | |||
|
617 | $ cat f.orig | |||
|
618 | gold | |||
|
619 | $ hg unshelve | |||
|
620 | unshelving change 'default' | |||
|
621 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |||
|
622 | rebasing shelved changes | |||
|
623 | $ hg st | |||
|
624 | M a | |||
|
625 | A f | |||
|
626 | ? f.orig | |||
|
627 | ||||
|
628 | other committed changes - merge: | |||
|
629 | ||||
|
630 | $ hg shelve f | |||
|
631 | shelved as default | |||
|
632 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
633 | $ hg ci a -m 'intermediate other change' | |||
|
634 | $ mv f.orig f | |||
|
635 | $ hg unshelve | |||
|
636 | unshelving change 'default' | |||
|
637 | rebasing shelved changes | |||
|
638 | merging f | |||
|
639 | warning: conflicts during merge. | |||
|
640 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |||
|
641 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | |||
|
642 | [1] | |||
|
643 | $ hg st | |||
|
644 | M f | |||
|
645 | ? f.orig | |||
|
646 | $ cat f | |||
|
647 | <<<<<<< local | |||
|
648 | gold | |||
|
649 | ======= | |||
|
650 | f | |||
|
651 | >>>>>>> other | |||
|
652 | $ cat f.orig | |||
|
653 | gold | |||
|
654 | $ hg unshelve --abort | |||
|
655 | rebase aborted | |||
|
656 | no changes needed to a | |||
|
657 | no changes needed to d | |||
|
658 | no changes needed to e | |||
|
659 | unshelve of 'default' aborted | |||
|
660 | $ hg shelve --delete default | |||
|
661 | ||||
533 | $ cd .. |
|
662 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now