Show More
@@ -136,9 +136,7 b' when shelve has to choose itself' | |||||
136 | cleaning the branches made for name checking tests |
|
136 | cleaning the branches made for name checking tests | |
137 |
|
137 | |||
138 | $ hg up default -q |
|
138 | $ hg up default -q | |
139 | $ hg strip 3 -q |
|
139 | $ hg strip e9177275307e+6a6d231f43d+882bae7c62c2 -q | |
140 | $ hg strip 2 -q |
|
|||
141 | $ hg strip 1 -q |
|
|||
142 |
|
140 | |||
143 | create an mq patch - shelving should work fine with a patch applied |
|
141 | create an mq patch - shelving should work fine with a patch applied | |
144 |
|
142 | |||
@@ -632,7 +630,7 b' shelve should leave dirstate clean (issu' | |||||
632 | $ hg commit -Aqm xy |
|
630 | $ hg commit -Aqm xy | |
633 | $ echo z >> x |
|
631 | $ echo z >> x | |
634 | $ hg commit -Aqm z |
|
632 | $ hg commit -Aqm z | |
635 |
$ hg up |
|
633 | $ hg up 5c4c67fb7dce | |
636 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
634 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
637 | $ printf 'a\nx\ny\nz\n' > x |
|
635 | $ printf 'a\nx\ny\nz\n' > x | |
638 | $ hg commit -Aqm xyz |
|
636 | $ hg commit -Aqm xyz | |
@@ -640,7 +638,7 b' shelve should leave dirstate clean (issu' | |||||
640 | $ hg shelve |
|
638 | $ hg shelve | |
641 | shelved as default |
|
639 | shelved as default | |
642 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
640 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
643 | $ hg rebase -d 1 --config extensions.rebase= |
|
641 | $ hg rebase -d 6c103be8f4e4 --config extensions.rebase= | |
644 | rebasing 2:323bfa07f744 "xyz" (tip) |
|
642 | rebasing 2:323bfa07f744 "xyz" (tip) | |
645 | merging x |
|
643 | merging x | |
646 | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg |
|
644 | saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-rebase.hg | |
@@ -661,7 +659,7 b' shelve should only unshelve pending chan' | |||||
661 | $ hg ci -Aqm a |
|
659 | $ hg ci -Aqm a | |
662 | $ touch b |
|
660 | $ touch b | |
663 | $ hg ci -Aqm b |
|
661 | $ hg ci -Aqm b | |
664 | $ hg up -q 0 |
|
662 | $ hg up -q 3903775176ed | |
665 |
$ |
|
663 | $ touch c | |
666 | $ hg ci -Aqm c |
|
664 | $ hg ci -Aqm c | |
667 |
|
665 | |||
@@ -670,7 +668,7 b' shelve should only unshelve pending chan' | |||||
670 | $ hg shelve |
|
668 | $ hg shelve | |
671 | shelved as default |
|
669 | shelved as default | |
672 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
670 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
673 |
$ hg up -q |
|
671 | $ hg up -q 0e067c57feba | |
674 |
$ |
|
672 | $ hg unshelve | |
675 | unshelving change 'default' |
|
673 | unshelving change 'default' | |
676 | rebasing shelved changes |
|
674 | rebasing shelved changes | |
@@ -683,7 +681,7 b' unshelve should work on an ancestor of t' | |||||
683 | $ hg shelve |
|
681 | $ hg shelve | |
684 | shelved as default |
|
682 | shelved as default | |
685 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
683 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
686 | $ hg up 0 |
|
684 | $ hg up 3903775176ed | |
687 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
685 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
688 | $ hg unshelve |
|
686 | $ hg unshelve | |
689 | unshelving change 'default' |
|
687 | unshelving change 'default' | |
@@ -701,7 +699,7 b' test bug 4073 we need to enable obsolete' | |||||
701 | $ hg shelve |
|
699 | $ hg shelve | |
702 | shelved as default |
|
700 | shelved as default | |
703 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
701 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
704 |
$ hg debugobsolete `hg |
|
702 | $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'` | |
705 | obsoleted 1 changesets |
|
703 | obsoleted 1 changesets | |
706 | $ hg unshelve |
|
704 | $ hg unshelve | |
707 | unshelving change 'default' |
|
705 | unshelving change 'default' | |
@@ -874,7 +872,7 b' unshelve and conflicts with tracked and ' | |||||
874 | Recreate some conflict again |
|
872 | Recreate some conflict again | |
875 |
|
873 | |||
876 | $ cd ../repo |
|
874 | $ cd ../repo | |
877 |
$ hg up -C -r |
|
875 | $ hg up -C -r 2e69b451d1ea | |
878 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
876 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
879 | (leaving bookmark test) |
|
877 | (leaving bookmark test) | |
880 | $ echo y >> a/a |
|
878 | $ echo y >> a/a | |
@@ -1204,7 +1202,7 b' Test visibility of in-memory changes ins' | |||||
1204 |
|
1202 | |||
1205 | == test visibility to external update hook |
|
1203 | == test visibility to external update hook | |
1206 |
|
1204 | |||
1207 |
$ hg update -q -C |
|
1205 | $ hg update -q -C 703117a2acfb | |
1208 |
|
1206 | |||
1209 | $ cat >> .hg/hgrc <<EOF |
|
1207 | $ cat >> .hg/hgrc <<EOF | |
1210 | > [hooks] |
|
1208 | > [hooks] | |
@@ -1280,7 +1278,7 b' Can the user leave the current state?' | |||||
1280 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1281 |
|
1279 | |||
1282 | Try again but with a corrupted shelve state file |
|
1280 | Try again but with a corrupted shelve state file | |
1283 |
$ hg strip -r |
|
1281 | $ hg strip -r 406ad6fb39eb -r e22bdf25c863 -q | |
1284 | $ hg up -r 0 -q |
|
1282 | $ hg up -r 0 -q | |
1285 | $ echo '' > root |
|
1283 | $ echo '' > root | |
1286 | $ hg shelve -q |
|
1284 | $ hg shelve -q | |
@@ -1558,7 +1556,7 b' test branch.' | |||||
1558 | $ hg shelve |
|
1556 | $ hg shelve | |
1559 | shelved as test |
|
1557 | shelved as test | |
1560 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1558 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1561 |
$ hg update -r |
|
1559 | $ hg update -r 7049e48789d7 | |
1562 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1560 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1563 | $ hg unshelve |
|
1561 | $ hg unshelve | |
1564 | unshelving change 'test' |
|
1562 | unshelving change 'test' |
General Comments 0
You need to be logged in to leave comments.
Login now