test-shelve.t
1510 lines
| 33.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-shelve.t
|
r39555 | #testcases stripbased phasebased | ||
|
r23172 | $ cat <<EOF >> $HGRCPATH | ||
> [extensions] | ||||
> mq = | ||||
> [defaults] | ||||
> diff = --nodates --git | ||||
> qnew = --date '0 0' | ||||
|
r25713 | > [shelve] | ||
> maxbackups = 2 | ||||
|
r23172 | > EOF | ||
|
r19854 | |||
|
r39555 | #if phasebased | ||
$ cat <<EOF >> $HGRCPATH | ||||
> [format] | ||||
> internal-phase = yes | ||||
> EOF | ||||
#endif | ||||
|
r19854 | $ hg init repo | ||
$ cd repo | ||||
$ mkdir a b | ||||
$ echo a > a/a | ||||
$ echo b > b/b | ||||
$ echo c > c | ||||
$ echo d > d | ||||
$ echo x > x | ||||
$ hg addremove -q | ||||
|
r24477 | shelve has a help message | ||
$ hg shelve -h | ||||
hg shelve [OPTION]... [FILE]... | ||||
save and set aside changes from the working directory | ||||
Shelving takes files that "hg status" reports as not clean, saves the | ||||
modifications to a bundle (a shelved change), and reverts the files so | ||||
that their state in the working directory becomes clean. | ||||
To restore these changes to the working directory, using "hg unshelve"; | ||||
this will work even if you switch to a different commit. | ||||
When no files are specified, "hg shelve" saves all not-clean files. If | ||||
specific files or directories are named, only changes to those files are | ||||
shelved. | ||||
|
r30419 | In bare shelve (when no files are specified, without interactive, include | ||
|
r28573 | and exclude option), shelving remembers information if the working | ||
directory was on newly created branch, in other words working directory | ||||
was on different branch than its first parent. In this situation | ||||
unshelving restores branch information to the working directory. | ||||
|
r24477 | Each shelved change has a name that makes it easier to find later. The | ||
name of a shelved change defaults to being based on the active bookmark, | ||||
or if there is no active bookmark, the current named branch. To specify a | ||||
different name, use "--name". | ||||
To see a list of existing shelved changes, use the "--list" option. For | ||||
each shelved change, this will print its name, age, and description; use " | ||||
--patch" or "--stat" for more details. | ||||
To delete specific shelved changes, use "--delete". To delete all shelved | ||||
changes, use "--cleanup". | ||||
options ([+] can be repeated): | ||||
|
r30152 | -A --addremove mark new/missing files as added/removed before | ||
|
r24477 | shelving | ||
|
r30152 | -u --unknown store unknown files in the shelve | ||
--cleanup delete all shelved changes | ||||
|
r24477 | --date DATE shelve with the specified commit date | ||
|
r30152 | -d --delete delete the named shelved change(s) | ||
|
r41046 | -e --edit invoke editor on commit messages | ||
|
r42178 | -k --keep shelve, but keep changes in the working directory | ||
|
r30152 | -l --list list current shelves | ||
|
r24477 | -m --message TEXT use text as shelve message | ||
-n --name NAME use the given name for the shelved commit | ||||
|
r38736 | -p --patch output patches for changes (provide the names of the | ||
shelved changes as positional arguments) | ||||
|
r42842 | -i --interactive interactive mode | ||
|
r38736 | --stat output diffstat-style summary of changes (provide | ||
the names of the shelved changes as positional | ||||
arguments) | ||||
|
r24477 | -I --include PATTERN [+] include names matching the given patterns | ||
-X --exclude PATTERN [+] exclude names matching the given patterns | ||||
|
r30152 | --mq operate on patch repository | ||
|
r24477 | |||
(some details hidden, use --verbose to show complete help) | ||||
|
r19854 | shelving in an empty repo should be possible | ||
|
r21852 | (this tests also that editor is not invoked, if '--edit' is not | ||
specified) | ||||
|
r19854 | |||
|
r21852 | $ HGEDITOR=cat hg shelve | ||
|
r19854 | shelved as default | ||
0 files updated, 0 files merged, 5 files removed, 0 files unresolved | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
$ hg commit -q -m 'initial commit' | ||||
$ hg shelve | ||||
nothing changed | ||||
[1] | ||||
|
r25712 | make sure shelve files were backed up | ||
$ ls .hg/shelve-backup | ||||
default.hg | ||||
default.patch | ||||
|
r39408 | default.shelve | ||
|
r25712 | |||
|
r30670 | checks to make sure we dont create a directory or | ||
hidden file while choosing a new shelve name | ||||
when we are given a name | ||||
$ hg shelve -n foo/bar | ||||
|
r30671 | abort: shelved change names can not contain slashes | ||
|
r30670 | [255] | ||
$ hg shelve -n .baz | ||||
|
r30671 | abort: shelved change names can not start with '.' | ||
|
r30670 | [255] | ||
$ hg shelve -n foo\\bar | ||||
|
r30671 | abort: shelved change names can not contain slashes | ||
|
r30670 | [255] | ||
when shelve has to choose itself | ||||
$ hg branch x/y -q | ||||
$ hg commit -q -m "Branch commit 0" | ||||
$ hg shelve | ||||
nothing changed | ||||
[1] | ||||
$ hg branch .x -q | ||||
$ hg commit -q -m "Branch commit 1" | ||||
$ hg shelve | ||||
|
r30671 | nothing changed | ||
[1] | ||||
|
r30670 | $ hg branch x\\y -q | ||
$ hg commit -q -m "Branch commit 2" | ||||
$ hg shelve | ||||
|
r30671 | nothing changed | ||
[1] | ||||
|
r30670 | |||
cleaning the branches made for name checking tests | ||||
$ hg up default -q | ||||
|
r38356 | $ hg strip e9177275307e+6a6d231f43d+882bae7c62c2 -q | ||
|
r30670 | |||
|
r19856 | create an mq patch - shelving should work fine with a patch applied | ||
|
r19854 | |||
$ echo n > n | ||||
$ hg add n | ||||
$ hg commit n -m second | ||||
|
r19856 | $ hg qnew second.patch | ||
|
r19854 | |||
shelve a change that we will delete later | ||||
$ echo a >> a/a | ||||
$ hg shelve | ||||
shelved as default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
set up some more complex changes to shelve | ||||
$ echo a >> a/a | ||||
$ hg mv b b.rename | ||||
|
r35394 | moving b/b to b.rename/b | ||
|
r19854 | $ hg cp c c.copy | ||
|
r44690 | $ hg mv d ghost | ||
$ rm ghost | ||||
|
r19854 | $ hg status -C | ||
M a/a | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
|
r44690 | R d | ||
! ghost | ||||
d | ||||
|
r19854 | |||
the common case - no options or filenames | ||||
|
r44691 | $ hg shelve | ||
shelved as default-01 | ||||
3 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
|
r19854 | $ hg status -C | ||
ensure that our shelved changes exist | ||||
$ hg shelve -l | ||||
|
r27092 | default-01 (*)* changes to: [mq]: second.patch (glob) | ||
default (*)* changes to: [mq]: second.patch (glob) | ||||
|
r19854 | |||
$ hg shelve -l -p default | ||||
|
r27092 | default (*)* changes to: [mq]: second.patch (glob) | ||
|
r19854 | |||
diff --git a/a/a b/a/a | ||||
--- a/a/a | ||||
+++ b/a/a | ||||
@@ -1,1 +1,2 @@ | ||||
a | ||||
+a | ||||
|
r21715 | $ hg shelve --list --addremove | ||
abort: options '--list' and '--addremove' may not be used together | ||||
[255] | ||||
|
r19854 | delete our older shelved change | ||
$ hg shelve -d default | ||||
|
r19856 | $ hg qfinish -a -q | ||
|
r19854 | |||
|
r25712 | ensure shelve backups aren't overwritten | ||
$ ls .hg/shelve-backup/ | ||||
default-1.hg | ||||
default-1.patch | ||||
|
r39408 | default-1.shelve | ||
|
r25712 | default.hg | ||
default.patch | ||||
|
r39408 | default.shelve | ||
|
r25712 | |||
|
r19961 | local edits should not prevent a shelved change from applying | ||
|
r19854 | |||
|
r19961 | $ printf "z\na\n" > a/a | ||
$ hg unshelve --keep | ||||
|
r19854 | unshelving change 'default-01' | ||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19961 | merging a/a | ||
|
r19854 | |||
|
r19961 | $ hg revert --all -q | ||
$ rm a/a.orig b.rename/b c.copy | ||||
|
r19854 | |||
apply it and make sure our state is as expected | ||||
|
r25774 | (this also tests that same timestamp prevents backups from being | ||
removed, even though there are more than 'maxbackups' backups) | ||||
|
r30554 | $ f -t .hg/shelve-backup/default.patch | ||
.hg/shelve-backup/default.patch: file | ||||
$ touch -t 200001010000 .hg/shelve-backup/default.patch | ||||
$ f -t .hg/shelve-backup/default-1.patch | ||||
.hg/shelve-backup/default-1.patch: file | ||||
$ touch -t 200001010000 .hg/shelve-backup/default-1.patch | ||||
|
r25774 | |||
|
r19854 | $ hg unshelve | ||
unshelving change 'default-01' | ||||
$ hg status -C | ||||
M a/a | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | $ hg shelve -l | ||
|
r25774 | (both of default.hg and default-1.hg should be still kept, because it | ||
is difficult to decide actual order of them from same timestamp) | ||||
$ ls .hg/shelve-backup/ | ||||
default-01.hg | ||||
default-01.patch | ||||
|
r39408 | default-01.shelve | ||
|
r25774 | default-1.hg | ||
default-1.patch | ||||
|
r39408 | default-1.shelve | ||
|
r25774 | default.hg | ||
default.patch | ||||
|
r39408 | default.shelve | ||
|
r25774 | |||
|
r19854 | $ hg unshelve | ||
abort: no shelved changes to apply! | ||||
[255] | ||||
$ hg unshelve foo | ||||
abort: shelved change 'foo' not found | ||||
[255] | ||||
named shelves, specific filenames, and "commit messages" should all work | ||||
|
r21852 | (this tests also that editor is invoked, if '--edit' is specified) | ||
|
r19854 | |||
$ hg status -C | ||||
M a/a | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r21852 | $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a | ||
wat | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: shelve@localhost | ||||
HG: branch 'default' | ||||
HG: changed a/a | ||||
|
r19854 | |||
expect "a" to no longer be present, but status otherwise unchanged | ||||
$ hg status -C | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | $ hg shelve -l --stat | ||
|
r19855 | wibble (*) wat (glob) | ||
|
r19854 | a/a | 1 + | ||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
and now "a/a" should reappear | ||||
|
r19943 | $ cd a | ||
|
r19854 | $ hg unshelve -q wibble | ||
|
r19943 | $ cd .. | ||
|
r19854 | $ hg status -C | ||
M a/a | ||||
A b.rename/b | ||||
b/b | ||||
A c.copy | ||||
c | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | |||
|
r25713 | ensure old shelve backups are being deleted automatically | ||
$ ls .hg/shelve-backup/ | ||||
default-01.hg | ||||
default-01.patch | ||||
|
r39408 | default-01.shelve | ||
|
r25713 | wibble.hg | ||
wibble.patch | ||||
|
r39408 | wibble.shelve | ||
|
r25713 | |||
|
r19854 | cause unshelving to result in a merge with 'a' conflicting | ||
$ hg shelve -q | ||||
$ echo c>>a/a | ||||
$ hg commit -m second | ||||
$ hg tip --template '{files}\n' | ||||
a/a | ||||
add an unrelated change that should be preserved | ||||
$ mkdir foo | ||||
$ echo foo > foo/foo | ||||
$ hg add foo/foo | ||||
force a conflicted merge to occur | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19854 | merging a/a | ||
|
r26614 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') | ||
|
r19854 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||
[1] | ||||
|
r33766 | $ hg status -v | ||
M a/a | ||||
M b.rename/b | ||||
M c.copy | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r33766 | ? a/a.orig | ||
# The repository is in an unfinished *unshelve* state. | ||||
# Unresolved merge conflicts: | ||||
# | ||||
|
r35394 | # a/a | ||
|
r33766 | # | ||
# To mark files as resolved: hg resolve --mark FILE | ||||
|
r38360 | # To continue: hg unshelve --continue | ||
# To abort: hg unshelve --abort | ||||
|
r33766 | |||
|
r19854 | |||
ensure that we have a merge with unresolved conflicts | ||||
|
r39780 | #if phasebased | ||
$ hg heads -q --template '{rev}\n' | ||||
8 | ||||
|
r44691 | 5 | ||
|
r39780 | $ hg parents -q --template '{rev}\n' | ||
8 | ||||
|
r44691 | 5 | ||
|
r39780 | #endif | ||
#if stripbased | ||||
|
r19961 | $ hg heads -q --template '{rev}\n' | ||
5 | ||||
4 | ||||
$ hg parents -q --template '{rev}\n' | ||||
4 | ||||
5 | ||||
|
r39780 | #endif | ||
|
r19854 | $ hg status | ||
M a/a | ||||
M b.rename/b | ||||
M c.copy | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | ? a/a.orig | ||
$ hg diff | ||||
diff --git a/a/a b/a/a | ||||
--- a/a/a | ||||
+++ b/a/a | ||||
@@ -1,2 +1,6 @@ | ||||
a | ||||
|
r39412 | +<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit | ||
|
r19854 | c | ||
+======= | ||||
+a | ||||
|
r44690 | +>>>>>>> working-copy: 203c9f771d2b - shelve: changes to: [mq]: second.patch | ||
|
r22905 | diff --git a/b/b b/b.rename/b | ||
rename from b/b | ||||
rename to b.rename/b | ||||
diff --git a/c b/c.copy | ||||
copy from c | ||||
copy to c.copy | ||||
|
r44690 | diff --git a/d b/d | ||
deleted file mode 100644 | ||||
--- a/d | ||||
+++ /dev/null | ||||
@@ -1,1 +0,0 @@ | ||||
-d | ||||
|
r19854 | $ hg resolve -l | ||
U a/a | ||||
$ hg shelve | ||||
abort: unshelve already in progress | ||||
(use 'hg unshelve --continue' or 'hg unshelve --abort') | ||||
[255] | ||||
abort the unshelve and be happy | ||||
$ hg status | ||||
M a/a | ||||
M b.rename/b | ||||
M c.copy | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | ? a/a.orig | ||
$ hg unshelve -a | ||||
unshelve of 'default' aborted | ||||
$ hg heads -q | ||||
|
r39780 | [37]:2e69b451d1ea (re) | ||
|
r19854 | $ hg parents | ||
|
r39780 | changeset: [37]:2e69b451d1ea (re) | ||
|
r19854 | tag: tip | ||
|
r39780 | parent: 3:509104101065 (?) | ||
|
r19854 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: second | ||||
$ hg resolve -l | ||||
$ hg status | ||||
A foo/foo | ||||
? a/a.orig | ||||
try to continue with no unshelve underway | ||||
$ hg unshelve -c | ||||
|
r28124 | abort: no unshelve in progress | ||
|
r19854 | [255] | ||
$ hg status | ||||
A foo/foo | ||||
? a/a.orig | ||||
redo the unshelve to get a conflict | ||||
$ hg unshelve -q | ||||
|
r26614 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') | ||
|
r19854 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||
[1] | ||||
attempt to continue | ||||
$ hg unshelve -c | ||||
abort: unresolved conflicts, can't continue | ||||
(see 'hg resolve', then 'hg unshelve --continue') | ||||
[255] | ||||
$ hg revert -r . a/a | ||||
$ hg resolve -m a/a | ||||
|
r21947 | (no more unresolved files) | ||
|
r27694 | continue: hg unshelve --continue | ||
|
r19854 | |||
|
r19963 | $ hg commit -m 'commit while unshelve in progress' | ||
abort: unshelve already in progress | ||||
(use 'hg unshelve --continue' or 'hg unshelve --abort') | ||||
[255] | ||||
|
r28124 | $ hg graft --continue | ||
abort: no graft in progress | ||||
(continue: hg unshelve --continue) | ||||
[255] | ||||
|
r19854 | $ hg unshelve -c | ||
unshelve of 'default' complete | ||||
ensure the repo is as we hope | ||||
$ hg parents | ||||
|
r39780 | changeset: [37]:2e69b451d1ea (re) | ||
|
r19854 | tag: tip | ||
|
r39780 | parent: 3:509104101065 (?) | ||
|
r19854 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: second | ||||
$ hg heads -q | ||||
|
r39780 | [37]:2e69b451d1ea (re) | ||
|
r19854 | |||
$ hg status -C | ||||
|
r19961 | A b.rename/b | ||
|
r19854 | b/b | ||
|
r19961 | A c.copy | ||
|
r19854 | c | ||
A foo/foo | ||||
R b/b | ||||
|
r44690 | R d | ||
|
r19854 | ? a/a.orig | ||
there should be no shelves left | ||||
$ hg shelve -l | ||||
#if execbit | ||||
ensure that metadata-only changes are shelved | ||||
$ chmod +x a/a | ||||
$ hg shelve -q -n execbit a/a | ||||
$ hg status a/a | ||||
$ hg unshelve -q execbit | ||||
$ hg status a/a | ||||
M a/a | ||||
$ hg revert a/a | ||||
|
r39797 | #else | ||
Dummy shelve op, to keep rev numbers aligned | ||||
$ echo foo > a/a | ||||
$ hg shelve -q -n dummy a/a | ||||
$ hg unshelve -q dummy | ||||
$ hg revert a/a | ||||
|
r19854 | #endif | ||
#if symlink | ||||
$ rm a/a | ||||
$ ln -s foo a/a | ||||
$ hg shelve -q -n symlink a/a | ||||
$ hg status a/a | ||||
|
r31021 | $ hg unshelve -q -n symlink | ||
|
r19854 | $ hg status a/a | ||
M a/a | ||||
$ hg revert a/a | ||||
|
r39797 | #else | ||
Dummy shelve op, to keep rev numbers aligned | ||||
$ echo bar > a/a | ||||
$ hg shelve -q -n dummy a/a | ||||
$ hg unshelve -q dummy | ||||
$ hg revert a/a | ||||
|
r19854 | #endif | ||
set up another conflict between a commit and a shelved change | ||||
$ hg revert -q -C -a | ||||
|
r19961 | $ rm a/a.orig b.rename/b c.copy | ||
|
r19854 | $ echo a >> a/a | ||
$ hg shelve -q | ||||
$ echo x >> a/a | ||||
$ hg ci -m 'create conflict' | ||||
$ hg add foo/foo | ||||
if we resolve a conflict while unshelving, the unshelve should succeed | ||||
|
r27021 | $ hg unshelve --tool :merge-other --keep | ||
unshelving change 'default' | ||||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
merging a/a | ||||
$ hg parents -q | ||||
|
r39780 | (4|13):33f7f61e6c5e (re) | ||
|
r27021 | $ hg shelve -l | ||
|
r27092 | default (*)* changes to: second (glob) | ||
|
r27021 | $ hg status | ||
M a/a | ||||
A foo/foo | ||||
$ cat a/a | ||||
a | ||||
c | ||||
a | ||||
$ cat > a/a << EOF | ||||
> a | ||||
> c | ||||
> x | ||||
> EOF | ||||
|
r19854 | $ HGMERGE=true hg unshelve | ||
unshelving change 'default' | ||||
|
r20413 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
rebasing shelved changes | ||||
|
r19854 | merging a/a | ||
|
r38637 | note: unshelved changes already existed in the working copy | ||
|
r19854 | $ hg parents -q | ||
|
r39780 | (4|13):33f7f61e6c5e (re) | ||
|
r19854 | $ hg shelve -l | ||
$ hg status | ||||
A foo/foo | ||||
$ cat a/a | ||||
a | ||||
c | ||||
x | ||||
test keep and cleanup | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg shelve --list | ||||
|
r27092 | default (*)* changes to: create conflict (glob) | ||
|
r27019 | $ hg unshelve -k | ||
|
r19854 | unshelving change 'default' | ||
$ hg shelve --list | ||||
|
r27092 | default (*)* changes to: create conflict (glob) | ||
|
r19854 | $ hg shelve --cleanup | ||
$ hg shelve --list | ||||
|
r19874 | |||
|
r21715 | $ hg shelve --cleanup --delete | ||
abort: options '--cleanup' and '--delete' may not be used together | ||||
[255] | ||||
$ hg shelve --cleanup --patch | ||||
abort: options '--cleanup' and '--patch' may not be used together | ||||
[255] | ||||
$ hg shelve --cleanup --message MESSAGE | ||||
abort: options '--cleanup' and '--message' may not be used together | ||||
[255] | ||||
|
r19874 | test bookmarks | ||
$ hg bookmark test | ||||
$ hg bookmark | ||||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r19874 | $ hg shelve | ||
shelved as test | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg bookmark | ||||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r19874 | $ hg unshelve | ||
unshelving change 'test' | ||||
$ hg bookmark | ||||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r19885 | |||
shelve should still work even if mq is disabled | ||||
$ hg --config extensions.mq=! shelve | ||||
shelved as test | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg --config extensions.mq=! shelve --list | ||||
|
r27092 | test (*)* changes to: create conflict (glob) | ||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r19885 | $ hg --config extensions.mq=! unshelve | ||
unshelving change 'test' | ||||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r19887 | |||
|
r22842 | Recreate some conflict again | ||
|
r38356 | $ hg up -C -r 2e69b451d1ea | ||
|
r22842 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(leaving bookmark test) | ||||
$ echo y >> a/a | ||||
$ hg shelve | ||||
shelved as default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg up test | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark test) | ||||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r22842 | $ hg unshelve | ||
unshelving change 'default' | ||||
rebasing shelved changes | ||||
merging a/a | ||||
|
r26614 | warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') | ||
|
r22842 | unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||
[1] | ||||
|
r26520 | $ hg bookmark | ||
|
r39780 | test (4|13):33f7f61e6c5e (re) | ||
|
r22842 | |||
Test that resolving all conflicts in one direction (so that the rebase | ||||
is a no-op), works (issue4398) | ||||
$ hg revert -a -r . | ||||
|
r35394 | reverting a/a | ||
|
r22842 | $ hg resolve -m a/a | ||
(no more unresolved files) | ||||
|
r27694 | continue: hg unshelve --continue | ||
|
r22842 | $ hg unshelve -c | ||
|
r38481 | note: unshelved changes already existed in the working copy | ||
|
r22842 | unshelve of 'default' complete | ||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r22842 | $ hg diff | ||
$ hg status | ||||
? a/a.orig | ||||
? foo/foo | ||||
$ hg summary | ||||
|
r39780 | parent: (4|13):33f7f61e6c5e tip (re) | ||
|
r22842 | create conflict | ||
branch: default | ||||
bookmarks: *test | ||||
commit: 2 unknown (clean) | ||||
update: (current) | ||||
|
r25382 | phases: 5 draft | ||
|
r22842 | |||
|
r21715 | $ hg shelve --delete --stat | ||
abort: options '--delete' and '--stat' may not be used together | ||||
[255] | ||||
$ hg shelve --delete --name NAME | ||||
abort: options '--delete' and '--name' may not be used together | ||||
[255] | ||||
|
r24478 | Test interactive shelve | ||
$ cat <<EOF >> $HGRCPATH | ||||
> [ui] | ||||
> interactive = true | ||||
> EOF | ||||
$ echo 'a' >> a/b | ||||
$ cat a/a >> a/b | ||||
$ echo 'x' >> a/b | ||||
$ mv a/b a/a | ||||
$ echo 'a' >> foo/foo | ||||
$ hg st | ||||
M a/a | ||||
? a/a.orig | ||||
? foo/foo | ||||
$ cat a/a | ||||
a | ||||
a | ||||
c | ||||
x | ||||
x | ||||
$ cat foo/foo | ||||
foo | ||||
a | ||||
|
r25799 | $ hg shelve --interactive --config ui.interactive=false | ||
abort: running non-interactively | ||||
[255] | ||||
|
r24478 | $ hg shelve --interactive << EOF | ||
> y | ||||
> y | ||||
> n | ||||
> EOF | ||||
diff --git a/a/a b/a/a | ||||
2 hunks, 2 lines changed | ||||
|
r42766 | examine changes to 'a/a'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r24478 | |||
@@ -1,3 +1,4 @@ | ||||
+a | ||||
a | ||||
c | ||||
x | ||||
|
r42766 | record change 1/2 to 'a/a'? | ||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r24478 | |||
@@ -1,3 +2,4 @@ | ||||
a | ||||
c | ||||
x | ||||
+x | ||||
|
r42766 | record change 2/2 to 'a/a'? | ||
(enter ? for help) [Ynesfdaq?] n | ||||
|
r24478 | |||
shelved as test | ||||
merging a/a | ||||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
$ cat a/a | ||||
a | ||||
c | ||||
x | ||||
x | ||||
$ cat foo/foo | ||||
foo | ||||
a | ||||
$ hg st | ||||
M a/a | ||||
? foo/foo | ||||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r24478 | $ hg unshelve | ||
unshelving change 'test' | ||||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
merging a/a | ||||
|
r26520 | $ hg bookmark | ||
|
r39780 | \* test (4|13):33f7f61e6c5e (re) | ||
|
r24478 | $ cat a/a | ||
a | ||||
a | ||||
c | ||||
x | ||||
x | ||||
|
r25104 | |||
|
r30823 | shelve --patch and shelve --stat should work with valid shelfnames | ||
|
r25104 | |||
$ hg up --clean . | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r26520 | (leaving bookmark test) | ||
|
r25104 | $ hg shelve --list | ||
$ echo 'patch a' > shelf-patch-a | ||||
$ hg add shelf-patch-a | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'patch b' > shelf-patch-b | ||||
$ hg add shelf-patch-b | ||||
$ hg shelve | ||||
shelved as default-01 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg shelve --patch default default-01 | ||||
|
r30823 | default-01 (*)* changes to: create conflict (glob) | ||
diff --git a/shelf-patch-b b/shelf-patch-b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/shelf-patch-b | ||||
@@ -0,0 +1,1 @@ | ||||
+patch b | ||||
default (*)* changes to: create conflict (glob) | ||||
diff --git a/shelf-patch-a b/shelf-patch-a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/shelf-patch-a | ||||
@@ -0,0 +1,1 @@ | ||||
+patch a | ||||
|
r25104 | $ hg shelve --stat default default-01 | ||
|
r30823 | default-01 (*)* changes to: create conflict (glob) | ||
shelf-patch-b | 1 + | ||||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
default (*)* changes to: create conflict (glob) | ||||
shelf-patch-a | 1 + | ||||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
|
r25104 | $ hg shelve --patch default | ||
|
r27092 | default (*)* changes to: create conflict (glob) | ||
|
r25104 | |||
diff --git a/shelf-patch-a b/shelf-patch-a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/shelf-patch-a | ||||
@@ -0,0 +1,1 @@ | ||||
+patch a | ||||
$ hg shelve --stat default | ||||
|
r27092 | default (*)* changes to: create conflict (glob) | ||
|
r25104 | shelf-patch-a | 1 + | ||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
$ hg shelve --patch nonexistentshelf | ||||
abort: cannot find shelf nonexistentshelf | ||||
[255] | ||||
$ hg shelve --stat nonexistentshelf | ||||
abort: cannot find shelf nonexistentshelf | ||||
[255] | ||||
|
r30823 | $ hg shelve --patch default nonexistentshelf | ||
abort: cannot find shelf nonexistentshelf | ||||
[255] | ||||
|
r38737 | |||
when the user asks for a patch, we assume they want the most recent shelve if | ||||
they don't provide a shelve name | ||||
|
r30823 | $ hg shelve --patch | ||
|
r38737 | default-01 (*)* changes to: create conflict (glob) | ||
diff --git a/shelf-patch-b b/shelf-patch-b | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/shelf-patch-b | ||||
@@ -0,0 +1,1 @@ | ||||
+patch b | ||||
$ cd .. | ||||
|
r26507 | Shelve from general delta repo uses bundle2 on disk | ||
-------------------------------------------------- | ||||
no general delta | ||||
|
r26914 | $ hg clone --pull repo bundle1 --config format.usegeneraldelta=0 | ||
|
r26507 | requesting all changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 5 changesets with 8 changes to 6 files | ||||
|
r34662 | new changesets cc01e2b0c59f:33f7f61e6c5e | ||
|
r26507 | updating to branch default | ||
6 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd bundle1 | ||||
$ echo babar > jungle | ||||
$ hg add jungle | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugbundle .hg/shelved/*.hg | ||||
|
r39412 | 330882a04d2ce8487636b1fb292e5beea77fa1e3 | ||
|
r26507 | $ cd .. | ||
with general delta | ||||
|
r26914 | $ hg clone --pull repo bundle2 --config format.usegeneraldelta=1 | ||
|
r26507 | requesting all changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 5 changesets with 8 changes to 6 files | ||||
|
r34662 | new changesets cc01e2b0c59f:33f7f61e6c5e | ||
|
r26507 | updating to branch default | ||
6 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd bundle2 | ||||
$ echo babar > jungle | ||||
$ hg add jungle | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg debugbundle .hg/shelved/*.hg | ||||
|
r34027 | Stream params: {Compression: BZ} | ||
|
r37919 | changegroup -- {nbchanges: 1, version: 02} (mandatory: True) | ||
|
r39412 | 330882a04d2ce8487636b1fb292e5beea77fa1e3 | ||
|
r42180 | |||
Test shelve --keep | ||||
$ hg unshelve | ||||
unshelving change 'default' | ||||
|
r42187 | $ hg shelve --keep --list | ||
abort: options '--list' and '--keep' may not be used together | ||||
[255] | ||||
$ hg shelve --keep --patch | ||||
abort: options '--patch' and '--keep' may not be used together | ||||
[255] | ||||
$ hg shelve --keep --delete | ||||
abort: options '--delete' and '--keep' may not be used together | ||||
[255] | ||||
|
r42180 | $ hg shelve --keep | ||
shelved as default | ||||
$ hg diff | ||||
diff --git a/jungle b/jungle | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/jungle | ||||
@@ -0,0 +1,1 @@ | ||||
+babar | ||||
|
r44121 | |||
Test shelve --delete | ||||
$ hg shelve --list | ||||
default (*s ago) changes to: create conflict (glob) | ||||
$ hg shelve --delete doesnotexist | ||||
abort: shelved change 'doesnotexist' not found | ||||
[255] | ||||
$ hg shelve --delete default | ||||
|
r26507 | $ cd .. | ||
|
r26681 | |||
|
r26751 | Test visibility of in-memory changes inside transaction to external hook | ||
------------------------------------------------------------------------ | ||||
$ cd repo | ||||
$ echo xxxx >> x | ||||
$ hg commit -m "#5: changes to invoke rebase" | ||||
$ cat > $TESTTMP/checkvisibility.sh <<EOF | ||||
> echo "==== \$1:" | ||||
> hg parents --template "VISIBLE {rev}:{node|short}\n" | ||||
> # test that pending changes are hidden | ||||
> unset HG_PENDING | ||||
> hg parents --template "ACTUAL {rev}:{node|short}\n" | ||||
> echo "====" | ||||
> EOF | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [defaults] | ||||
> # to fix hash id of temporary revisions | ||||
> unshelve = --date '0 0' | ||||
> EOF | ||||
"hg unshelve" at REV5 implies steps below: | ||||
(1) commit changes in the working directory (REV6) | ||||
(2) unbundle shelved revision (REV7) | ||||
(3) rebase: merge REV7 into REV6 (REV6 => REV6, REV7) | ||||
(4) rebase: commit merged revision (REV8) | ||||
(5) rebase: update to REV6 (REV8 => REV6) | ||||
(6) update to REV5 (REV6 => REV5) | ||||
(7) abort transaction | ||||
== test visibility to external preupdate hook | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [hooks] | ||||
> preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate | ||||
> EOF | ||||
$ echo nnnn >> n | ||||
$ sh $TESTTMP/checkvisibility.sh before-unshelving | ||||
==== before-unshelving: | ||||
|
r39780 | VISIBLE (5|19):703117a2acfb (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26751 | ==== | ||
$ hg unshelve --keep default | ||||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
==== preupdate: | ||||
|
r39780 | VISIBLE (6|20):54c00d20fb3f (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26751 | ==== | ||
==== preupdate: | ||||
|
r39780 | VISIBLE (8|21):8efe6f7537dc (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26751 | ==== | ||
==== preupdate: | ||||
|
r39780 | VISIBLE (6|20):54c00d20fb3f (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26751 | ==== | ||
$ cat >> .hg/hgrc <<EOF | ||||
> [hooks] | ||||
> preupdate.visibility = | ||||
> EOF | ||||
$ sh $TESTTMP/checkvisibility.sh after-unshelving | ||||
==== after-unshelving: | ||||
|
r39780 | VISIBLE (5|19):703117a2acfb (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26751 | ==== | ||
|
r26752 | == test visibility to external update hook | ||
|
r38356 | $ hg update -q -C 703117a2acfb | ||
|
r26752 | |||
$ cat >> .hg/hgrc <<EOF | ||||
> [hooks] | ||||
> update.visibility = sh $TESTTMP/checkvisibility.sh update | ||||
> EOF | ||||
$ echo nnnn >> n | ||||
$ sh $TESTTMP/checkvisibility.sh before-unshelving | ||||
==== before-unshelving: | ||||
|
r39780 | VISIBLE (5|19):703117a2acfb (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26752 | ==== | ||
$ hg unshelve --keep default | ||||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
==== update: | ||||
|
r39780 | VISIBLE (6|20):54c00d20fb3f (re) | ||
VISIBLE 1?7:492ed9d705e5 (re) | ||||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26752 | ==== | ||
==== update: | ||||
|
r39780 | VISIBLE (6|20):54c00d20fb3f (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26752 | ==== | ||
==== update: | ||||
|
r39780 | VISIBLE (5|19):703117a2acfb (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26752 | ==== | ||
$ cat >> .hg/hgrc <<EOF | ||||
> [hooks] | ||||
> update.visibility = | ||||
> EOF | ||||
$ sh $TESTTMP/checkvisibility.sh after-unshelving | ||||
==== after-unshelving: | ||||
|
r39780 | VISIBLE (5|19):703117a2acfb (re) | ||
ACTUAL (5|19):703117a2acfb (re) | ||||
|
r26752 | ==== | ||
|
r26751 | $ cd .. | ||
|
r26933 | Keep active bookmark while (un)shelving even on shared repo (issue4940) | ||
----------------------------------------------------------------------- | ||||
$ cat <<EOF >> $HGRCPATH | ||||
> [extensions] | ||||
> share = | ||||
> EOF | ||||
$ hg bookmarks -R repo | ||||
|
r39780 | test (4|13):33f7f61e6c5e (re) | ||
|
r26933 | $ hg share -B repo share | ||
updating working directory | ||||
6 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd share | ||||
$ hg bookmarks | ||||
|
r39780 | test (4|13):33f7f61e6c5e (re) | ||
|
r26933 | $ hg bookmarks foo | ||
$ hg bookmarks | ||||
|
r39780 | \* foo (5|19):703117a2acfb (re) | ||
test (4|13):33f7f61e6c5e (re) | ||||
|
r26933 | $ echo x >> x | ||
$ hg shelve | ||||
shelved as foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg bookmarks | ||||
|
r39780 | \* foo (5|19):703117a2acfb (re) | ||
test (4|13):33f7f61e6c5e (re) | ||||
|
r26933 | |||
$ hg unshelve | ||||
unshelving change 'foo' | ||||
$ hg bookmarks | ||||
|
r39780 | \* foo (5|19):703117a2acfb (re) | ||
test (4|13):33f7f61e6c5e (re) | ||||
|
r26933 | |||
$ cd .. | ||||
|
r42217 | |||
Abort unshelve while merging (issue5123) | ||||
---------------------------------------- | ||||
$ hg init issue5123 | ||||
$ cd issue5123 | ||||
$ echo > a | ||||
$ hg ci -Am a | ||||
adding a | ||||
$ hg co null | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo > b | ||||
$ hg ci -Am b | ||||
adding b | ||||
created new head | ||||
$ echo > c | ||||
$ hg add c | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg co 1 | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg merge 0 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
-- successful merge with two parents | ||||
$ hg log -G | ||||
@ changeset: 1:406bf70c274f | ||||
tag: tip | ||||
parent: -1:000000000000 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: b | ||||
@ changeset: 0:ada8c9eb8252 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
-- trying to pull in the shelve bits | ||||
-- unshelve should abort otherwise, it'll eat my second parent. | ||||
$ hg unshelve | ||||
|
r42732 | abort: outstanding uncommitted merge | ||
(use 'hg commit' or 'hg merge --abort') | ||||
|
r42217 | [255] | ||
$ cd .. | ||||
|
r42835 | |||
-- test for interactive mode on unshelve | ||||
$ hg init a | ||||
$ cd a | ||||
$ echo > b | ||||
$ hg ci -Am b | ||||
adding b | ||||
$ echo > c | ||||
$ echo > d | ||||
$ hg add . | ||||
adding c | ||||
adding d | ||||
$ hg shelve | ||||
shelved as default | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ echo > e | ||||
$ hg add e | ||||
$ hg ci -m e | ||||
$ hg shelve --patch | ||||
|
r42848 | default (*s ago) changes to: b (glob) | ||
|
r42835 | |||
diff --git a/c b/c | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/c | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
diff --git a/d b/d | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/d | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
$ hg unshelve -i <<EOF | ||||
> y | ||||
> y | ||||
> y | ||||
> n | ||||
> EOF | ||||
unshelving change 'default' | ||||
rebasing shelved changes | ||||
diff --git a/c b/c | ||||
new file mode 100644 | ||||
examine changes to 'c'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
record change 1/2 to 'c'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
diff --git a/d b/d | ||||
new file mode 100644 | ||||
examine changes to 'd'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
record change 2/2 to 'd'? | ||||
(enter ? for help) [Ynesfdaq?] n | ||||
$ ls | ||||
b | ||||
c | ||||
e | ||||
-- shelve should not contain `c` now | ||||
$ hg shelve --patch | ||||
|
r42848 | default (*s ago) changes to: b (glob) | ||
|
r42835 | |||
diff --git a/d b/d | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/d | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
$ hg unshelve -i <<EOF | ||||
> y | ||||
> y | ||||
> EOF | ||||
unshelving change 'default' | ||||
|
r42932 | temporarily committing pending changes (restore with 'hg unshelve --abort') | ||
|
r42835 | rebasing shelved changes | ||
diff --git a/d b/d | ||||
new file mode 100644 | ||||
examine changes to 'd'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
record this change to 'd'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r42932 | |||
$ hg status -v | ||||
A c | ||||
A d | ||||
|
r42835 | $ ls | ||
b | ||||
c | ||||
d | ||||
e | ||||
$ hg shelve --list | ||||
-- now, unshelve selected changes from a file | ||||
$ echo B > foo | ||||
$ hg add foo | ||||
$ hg ci -m 'add B to foo' | ||||
$ cat > foo <<EOF | ||||
> A | ||||
> B | ||||
> C | ||||
> EOF | ||||
|
r42961 | $ echo > garbage | ||
$ hg st | ||||
M foo | ||||
? garbage | ||||
$ hg shelve --unknown | ||||
|
r42835 | shelved as default | ||
|
r42961 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r42835 | $ cat foo | ||
B | ||||
$ hg unshelve -i <<EOF | ||||
> y | ||||
> y | ||||
> n | ||||
|
r42961 | > y | ||
> y | ||||
|
r42835 | > EOF | ||
unshelving change 'default' | ||||
rebasing shelved changes | ||||
diff --git a/foo b/foo | ||||
2 hunks, 2 lines changed | ||||
examine changes to 'foo'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -1,1 +1,2 @@ | ||||
+A | ||||
B | ||||
|
r42961 | record change 1/3 to 'foo'? | ||
|
r42835 | (enter ? for help) [Ynesfdaq?] y | ||
@@ -1,1 +2,2 @@ | ||||
B | ||||
+C | ||||
|
r42961 | record change 2/3 to 'foo'? | ||
|
r42835 | (enter ? for help) [Ynesfdaq?] n | ||
|
r42961 | diff --git a/garbage b/garbage | ||
new file mode 100644 | ||||
examine changes to 'garbage'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -0,0 +1,1 @@ | ||||
+ | ||||
record change 3/3 to 'garbage'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
$ hg st | ||||
M foo | ||||
? garbage | ||||
|
r42835 | $ cat foo | ||
A | ||||
B | ||||
$ hg shelve --patch | ||||
|
r42848 | default (*s ago) changes to: add B to foo (glob) | ||
|
r42835 | |||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -1,2 +1,3 @@ | ||||
A | ||||
B | ||||
+C | ||||
-- unshelve interactive on conflicts | ||||
$ echo A >> bar1 | ||||
$ echo A >> bar2 | ||||
$ hg add bar1 bar2 | ||||
$ hg ci -m 'add A to bars' | ||||
$ echo B >> bar1 | ||||
$ echo B >> bar2 | ||||
$ hg shelve | ||||
shelved as default-01 | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo C >> bar1 | ||||
$ echo C >> bar2 | ||||
$ hg ci -m 'add C to bars' | ||||
$ hg unshelve -i | ||||
unshelving change 'default-01' | ||||
rebasing shelved changes | ||||
merging bar1 | ||||
merging bar2 | ||||
warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark') | ||||
warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark') | ||||
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | ||||
[1] | ||||
$ cat > bar1 <<EOF | ||||
> A | ||||
> B | ||||
> C | ||||
> EOF | ||||
$ cat > bar2 <<EOF | ||||
> A | ||||
> B | ||||
> C | ||||
> EOF | ||||
$ hg resolve -m bar1 bar2 | ||||
(no more unresolved files) | ||||
continue: hg unshelve --continue | ||||
|
r42893 | |||
-- using --continue with --interactive should throw an error | ||||
$ hg unshelve --continue -i | ||||
abort: cannot use both continue and interactive | ||||
[255] | ||||
|
r42835 | $ cat bar1 | ||
A | ||||
B | ||||
C | ||||
|
r42930 | |||
#if stripbased | ||||
$ hg log -r 3:: -G | ||||
|
r42932 | @ changeset: 5:f1d5f53e397b | ||
|
r42930 | | tag: tip | ||
|
r42932 | | parent: 3:e28fd7fa7938 | ||
|
r42930 | | user: shelve@localhost | ||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: changes to: add A to bars | ||||
| | ||||
|
r42932 | | @ changeset: 4:fe451a778c81 | ||
|
r42930 | |/ user: test | ||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: add C to bars | ||||
| | ||||
|
r42932 | o changeset: 3:e28fd7fa7938 | ||
|
r42930 | | user: test | ||
~ date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add A to bars | ||||
#endif | ||||
|
r42889 | $ hg unshelve --continue <<EOF | ||
|
r42835 | > y | ||
> y | ||||
> y | ||||
|
r42930 | > n | ||
|
r42835 | > EOF | ||
diff --git a/bar1 b/bar1 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'bar1'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -1,2 +1,3 @@ | ||||
A | ||||
+B | ||||
C | ||||
record change 1/2 to 'bar1'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
diff --git a/bar2 b/bar2 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'bar2'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -1,2 +1,3 @@ | ||||
A | ||||
+B | ||||
C | ||||
record change 2/2 to 'bar2'? | ||||
|
r42930 | (enter ? for help) [Ynesfdaq?] n | ||
|
r42835 | |||
unshelve of 'default-01' complete | ||||
|
r42930 | |||
#if stripbased | ||||
$ hg log -r 3:: -G | ||||
|
r42932 | @ changeset: 4:fe451a778c81 | ||
|
r42930 | | tag: tip | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: add C to bars | ||||
| | ||||
|
r42932 | o changeset: 3:e28fd7fa7938 | ||
|
r42930 | | user: test | ||
~ date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add A to bars | ||||
#endif | ||||
|
r42931 | |||
$ hg unshelve --continue | ||||
abort: no unshelve in progress | ||||
[255] | ||||
$ hg shelve --list | ||||
default-01 (*)* changes to: add A to bars (glob) | ||||
default (*)* changes to: add B to foo (glob) | ||||
$ hg unshelve -n default-01 -i <<EOF | ||||
> y | ||||
> y | ||||
> EOF | ||||
temporarily committing pending changes (restore with 'hg unshelve --abort') | ||||
rebasing shelved changes | ||||
diff --git a/bar2 b/bar2 | ||||
1 hunks, 1 lines changed | ||||
examine changes to 'bar2'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
@@ -1,2 +1,3 @@ | ||||
A | ||||
+B | ||||
C | ||||
record this change to 'bar2'? | ||||
(enter ? for help) [Ynesfdaq?] y | ||||
|
r43029 | -- test for --interactive --keep | ||
$ hg unshelve -i --keep | ||||
abort: --keep on --interactive is not yet supported | ||||
[255] | ||||