Show More
@@ -531,7 +531,7 b' unshelve should keep a copy of unknown f' | |||||
531 | z |
|
531 | z | |
532 |
|
532 | |||
533 |
|
533 | |||
534 | unshelve and conflicts with untracked files |
|
534 | unshelve and conflicts with tracked and untracked files | |
535 |
|
535 | |||
536 | preparing: |
|
536 | preparing: | |
537 |
|
537 | |||
@@ -546,7 +546,7 b' unshelve and conflicts with untracked fi' | |||||
546 | $ hg shelve |
|
546 | $ hg shelve | |
547 | shelved as default |
|
547 | shelved as default | |
548 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
548 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
549 |
$ echo g |
|
549 | $ echo g > f | |
550 | $ hg unshelve |
|
550 | $ hg unshelve | |
551 | unshelving change 'default' |
|
551 | unshelving change 'default' | |
552 | $ hg st |
|
552 | $ hg st | |
@@ -555,7 +555,7 b' unshelve and conflicts with untracked fi' | |||||
555 | $ cat f |
|
555 | $ cat f | |
556 | f |
|
556 | f | |
557 | $ cat f.orig |
|
557 | $ cat f.orig | |
558 |
g |
|
558 | g | |
559 |
|
559 | |||
560 | other uncommitted changes - merge: |
|
560 | other uncommitted changes - merge: | |
561 |
|
561 | |||
@@ -576,7 +576,7 b' unshelve and conflicts with untracked fi' | |||||
576 | o 0 a test |
|
576 | o 0 a test | |
577 |
|
577 | |||
578 | $ mv f.orig f |
|
578 | $ mv f.orig f | |
579 |
$ echo |
|
579 | $ echo 1 > a | |
580 | $ hg unshelve --date '1073741824 0' |
|
580 | $ hg unshelve --date '1073741824 0' | |
581 | unshelving change 'default' |
|
581 | unshelving change 'default' | |
582 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
582 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
@@ -602,12 +602,12 b' unshelve and conflicts with untracked fi' | |||||
602 | ? f.orig |
|
602 | ? f.orig | |
603 | $ cat f |
|
603 | $ cat f | |
604 | <<<<<<< local |
|
604 | <<<<<<< local | |
605 |
g |
|
605 | g | |
606 | ======= |
|
606 | ======= | |
607 | f |
|
607 | f | |
608 | >>>>>>> other |
|
608 | >>>>>>> other | |
609 | $ cat f.orig |
|
609 | $ cat f.orig | |
610 |
g |
|
610 | g | |
611 | $ hg unshelve --abort |
|
611 | $ hg unshelve --abort | |
612 | rebase aborted |
|
612 | rebase aborted | |
613 | unshelve of 'default' aborted |
|
613 | unshelve of 'default' aborted | |
@@ -615,7 +615,7 b' unshelve and conflicts with untracked fi' | |||||
615 | M a |
|
615 | M a | |
616 | ? f.orig |
|
616 | ? f.orig | |
617 | $ cat f.orig |
|
617 | $ cat f.orig | |
618 |
g |
|
618 | g | |
619 | $ hg unshelve |
|
619 | $ hg unshelve | |
620 | unshelving change 'default' |
|
620 | unshelving change 'default' | |
621 | temporarily committing pending changes (restore with 'hg unshelve --abort') |
|
621 | temporarily committing pending changes (restore with 'hg unshelve --abort') | |
@@ -645,18 +645,22 b' unshelve and conflicts with untracked fi' | |||||
645 | ? f.orig |
|
645 | ? f.orig | |
646 | $ cat f |
|
646 | $ cat f | |
647 | <<<<<<< local |
|
647 | <<<<<<< local | |
648 |
g |
|
648 | g | |
649 | ======= |
|
649 | ======= | |
650 | f |
|
650 | f | |
651 | >>>>>>> other |
|
651 | >>>>>>> other | |
652 | $ cat f.orig |
|
652 | $ cat f.orig | |
653 |
g |
|
653 | g | |
654 | $ hg unshelve --abort |
|
654 | $ hg unshelve --abort | |
655 | rebase aborted |
|
655 | rebase aborted | |
656 | no changes needed to a |
|
656 | no changes needed to a | |
657 | no changes needed to d |
|
657 | no changes needed to d | |
658 | no changes needed to e |
|
658 | no changes needed to e | |
659 | unshelve of 'default' aborted |
|
659 | unshelve of 'default' aborted | |
|
660 | $ hg st | |||
|
661 | ? f.orig | |||
|
662 | $ cat f.orig | |||
|
663 | g | |||
660 | $ hg shelve --delete default |
|
664 | $ hg shelve --delete default | |
661 |
|
665 | |||
662 | $ cd .. |
|
666 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now