tests/test-shelve.t
changeset 25104 d6453f6fbdba
parent 24872 3510ec97ffdc
child 25111 1ef96a3b8b89
equal deleted inserted replaced
25103:ce00b2e96d09 25104:d6453f6fbdba
   860   a
   860   a
   861   a
   861   a
   862   c
   862   c
   863   x
   863   x
   864   x
   864   x
   865   $ cd ..
   865 
       
   866 shelve --patch and shelve --stat should work with a single valid shelfname
       
   867 
       
   868   $ hg up --clean .
       
   869   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   870   $ hg shelve --list
       
   871   $ echo 'patch a' > shelf-patch-a
       
   872   $ hg add shelf-patch-a
       
   873   $ hg shelve
       
   874   shelved as default
       
   875   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   876   $ echo 'patch b' > shelf-patch-b
       
   877   $ hg add shelf-patch-b
       
   878   $ hg shelve
       
   879   shelved as default-01
       
   880   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   881   $ hg shelve --patch default default-01
       
   882   abort: --patch expects a single shelf
       
   883   [255]
       
   884   $ hg shelve --stat default default-01
       
   885   abort: --stat expects a single shelf
       
   886   [255]
       
   887   $ hg shelve --patch default
       
   888   default         (* ago)    changes to 'create conflict' (glob)
       
   889   
       
   890   diff --git a/shelf-patch-a b/shelf-patch-a
       
   891   new file mode 100644
       
   892   --- /dev/null
       
   893   +++ b/shelf-patch-a
       
   894   @@ -0,0 +1,1 @@
       
   895   +patch a
       
   896   $ hg shelve --stat default
       
   897   default         (* ago)    changes to 'create conflict' (glob)
       
   898    shelf-patch-a |  1 +
       
   899    1 files changed, 1 insertions(+), 0 deletions(-)
       
   900   $ hg shelve --patch nonexistentshelf
       
   901   abort: cannot find shelf nonexistentshelf
       
   902   [255]
       
   903   $ hg shelve --stat nonexistentshelf
       
   904   abort: cannot find shelf nonexistentshelf
       
   905   [255]
       
   906