equal
deleted
inserted
replaced
79 $ hg status -C |
79 $ hg status -C |
80 |
80 |
81 ensure that our shelved changes exist |
81 ensure that our shelved changes exist |
82 |
82 |
83 $ hg shelve -l |
83 $ hg shelve -l |
84 default-01 (*) [mq]: second.patch (glob) |
84 default-01 (*) changes to '[mq]: second.patch' (glob) |
85 default (*) [mq]: second.patch (glob) |
85 default (*) changes to '[mq]: second.patch' (glob) |
86 |
86 |
87 $ hg shelve -l -p default |
87 $ hg shelve -l -p default |
88 default (*) [mq]: second.patch (glob) |
88 default (*) changes to '[mq]: second.patch' (glob) |
89 |
89 |
90 diff --git a/a/a b/a/a |
90 diff --git a/a/a b/a/a |
91 --- a/a/a |
91 --- a/a/a |
92 +++ b/a/a |
92 +++ b/a/a |
93 @@ -1,1 +1,2 @@ |
93 @@ -1,1 +1,2 @@ |
398 |
398 |
399 $ hg shelve |
399 $ hg shelve |
400 shelved as default |
400 shelved as default |
401 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
401 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
402 $ hg shelve --list |
402 $ hg shelve --list |
403 default (*) create conflict (glob) |
403 default (*) changes to 'create conflict' (glob) |
404 $ hg unshelve --keep |
404 $ hg unshelve --keep |
405 unshelving change 'default' |
405 unshelving change 'default' |
406 adding changesets |
406 adding changesets |
407 adding manifests |
407 adding manifests |
408 adding file changes |
408 adding file changes |
409 added 1 changesets with 1 changes to 7 files |
409 added 1 changesets with 1 changes to 7 files |
410 $ hg shelve --list |
410 $ hg shelve --list |
411 default (*) create conflict (glob) |
411 default (*) changes to 'create conflict' (glob) |
412 $ hg shelve --cleanup |
412 $ hg shelve --cleanup |
413 $ hg shelve --list |
413 $ hg shelve --list |
414 |
414 |
415 test bookmarks |
415 test bookmarks |
416 |
416 |
435 |
435 |
436 $ hg --config extensions.mq=! shelve |
436 $ hg --config extensions.mq=! shelve |
437 shelved as test |
437 shelved as test |
438 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
438 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
439 $ hg --config extensions.mq=! shelve --list |
439 $ hg --config extensions.mq=! shelve --list |
440 test (1s ago) create conflict |
440 test (*) changes to 'create conflict' (glob) |
441 $ hg --config extensions.mq=! unshelve |
441 $ hg --config extensions.mq=! unshelve |
442 unshelving change 'test' |
442 unshelving change 'test' |
443 adding changesets |
443 adding changesets |
444 adding manifests |
444 adding manifests |
445 adding file changes |
445 adding file changes |