tests/test-mq-qimport.t
branchstable
changeset 27919 db24d6888896
parent 27513 707cdf2c3700
child 28388 b1d35e2e1af6
equal deleted inserted replaced
27918:c7cd551f07d0 27919:db24d6888896
   198   now at: appendbar.diff
   198   now at: appendbar.diff
   199   $ hg qfin -a
   199   $ hg qfin -a
   200   patch b.diff finalized without changeset message
   200   patch b.diff finalized without changeset message
   201   $ touch .hg/patches/append_foo
   201   $ touch .hg/patches/append_foo
   202   $ hg qimport -r 'p1(.)::'
   202   $ hg qimport -r 'p1(.)::'
   203   abort: patch "append_foo" already exists
       
   204   [255]
       
   205   $ hg qapplied
   203   $ hg qapplied
       
   204   append_foo__1
   206   append_bar
   205   append_bar
   207   $ hg qfin -a
   206   $ hg qfin -a
   208   $ rm .hg/patches/append_foo
   207   $ rm .hg/patches/append_foo
   209   $ hg qimport -r 'p1(.)::' -P
   208   $ hg qimport -r 'p1(.)::' -P
   210   $ hg qpop -a
   209   $ hg qpop -a
   311   0 A 1.diff
   310   0 A 1.diff
   312   1 U imported_patch_b_diff
   311   1 U imported_patch_b_diff
   313   2 U 0
   312   2 U 0
   314   3 U this-name-is-better
   313   3 U this-name-is-better
   315   4 U url.diff
   314   4 U url.diff
       
   315 
       
   316 check reserved patch names
       
   317 
       
   318   $ hg qpop -qa
       
   319   patch queue now empty
       
   320   $ echo >> b
       
   321   $ hg commit -m 'status'
       
   322   $ echo >> b
       
   323   $ hg commit -m '.'
       
   324   $ echo >> b
       
   325   $ hg commit -m 'taken'
       
   326   $ mkdir .hg/patches/taken
       
   327   $ touch .hg/patches/taken__1
       
   328   $ hg qimport -r -3::
       
   329   $ hg qap
       
   330   1.diff__1
       
   331   2.diff
       
   332   taken__2
       
   333