Show More
@@ -172,9 +172,9 b' def createcmd(ui, repo, pats, opts):' | |||||
172 | repo.mq.checkapplied = saved |
|
172 | repo.mq.checkapplied = saved | |
173 |
|
173 | |||
174 | if parent.node() != nullid: |
|
174 | if parent.node() != nullid: | |
175 | desc = parent.description().split('\n', 1)[0] |
|
175 | desc = "changes to '%s'" % parent.description().split('\n', 1)[0] | |
176 | else: |
|
176 | else: | |
177 | desc = '(empty repository)' |
|
177 | desc = '(changes in empty repository)' | |
178 |
|
178 | |||
179 | if not opts['message']: |
|
179 | if not opts['message']: | |
180 | opts['message'] = desc |
|
180 | opts['message'] = desc |
@@ -81,11 +81,11 b' the common case - no options or filename' | |||||
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 (*) |
|
84 | default-01 (*) changes to '[mq]: second.patch' (glob) | |
85 |
default (*) |
|
85 | default (*) changes to '[mq]: second.patch' (glob) | |
86 |
|
86 | |||
87 | $ hg shelve -l -p default |
|
87 | $ hg shelve -l -p default | |
88 |
default (*) |
|
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 | |
@@ -400,7 +400,7 b' test keep and cleanup' | |||||
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 | |
@@ -408,7 +408,7 b' test keep and cleanup' | |||||
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 | |||
@@ -437,7 +437,7 b' shelve should still work even if mq is d' | |||||
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 ( |
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now