tests/test-keyword.t
branchstable
changeset 793 9cc90e2c826f
parent 792 b87861f57222
child 797 f0d8ac85ca21
equal deleted inserted replaced
792:b87861f57222 793:9cc90e2c826f
   114 Default keyword expansion including commit hook
   114 Default keyword expansion including commit hook
   115 Interrupted commit should not change state or run commit hook
   115 Interrupted commit should not change state or run commit hook
   116 
   116 
   117   $ hg --debug commit
   117   $ hg --debug commit
   118   abort: empty commit message
   118   abort: empty commit message
       
   119   [255]
   119   $ hg status
   120   $ hg status
   120   A a
   121   A a
   121   A b
   122   A b
   122 
   123 
   123 Commit with several checks
   124 Commit with several checks
   538 
   539 
   539 Interrupted commit should not change state
   540 Interrupted commit should not change state
   540 
   541 
   541   $ hg commit
   542   $ hg commit
   542   abort: empty commit message
   543   abort: empty commit message
       
   544   [255]
   543   $ hg status
   545   $ hg status
   544   M a
   546   M a
   545   ? c
   547   ? c
   546   ? log
   548   ? log
   547 
   549 
   687 
   689 
   688 kwexpand x/a should abort
   690 kwexpand x/a should abort
   689 
   691 
   690   $ hg --verbose kwexpand x/a
   692   $ hg --verbose kwexpand x/a
   691   abort: outstanding uncommitted changes
   693   abort: outstanding uncommitted changes
       
   694   [255]
   692   $ cd x
   695   $ cd x
   693   $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
   696   $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
   694   x/a
   697   x/a
   695    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
   698    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
   696   overwriting x/a expanding keywords
   699   overwriting x/a expanding keywords
   816   merging m
   819   merging m
   817   warning: conflicts during merge.
   820   warning: conflicts during merge.
   818   merging m failed!
   821   merging m failed!
   819   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   822   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   820   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   823   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
       
   824   [1]
   821   $ cat m
   825   $ cat m
   822   $Id$
   826   $Id$
   823   <<<<<<< local
   827   <<<<<<< local
   824   bar
   828   bar
   825   =======
   829   =======