tests/test-keyword.out
branch0.9.2compat
changeset 348 63ebc698d06b
parent 339 98336da24c5e
child 359 4ac7e51443fe
child 379 290d023e8306
equal deleted inserted replaced
343:f5927e5574e6 348:63ebc698d06b
    22 Again, run "hg kwdemo" to control the results of your config changes.
    22 Again, run "hg kwdemo" to control the results of your config changes.
    23 Before changing/disabling active keywords, run "hg kwshrink" to avoid
    23 Before changing/disabling active keywords, run "hg kwshrink" to avoid
    24 the risk of inadvertedly storing expanded keywords in the change history.
    24 the risk of inadvertedly storing expanded keywords in the change history.
    25 To force expansion after enabling it, or a configuration change, run
    25 To force expansion after enabling it, or a configuration change, run
    26 "hg kwexpand".
    26 "hg kwexpand".
       
    27 Also, when committing with the record extension or using mq's qrecord, be aware
       
    28 that keywords cannot be updated. Again, run "hg kwexpand" on the files in
       
    29 question to update keyword expansions after all changes have been checked in.
    27 Expansions spanning more than one line and incremental expansions,
    30 Expansions spanning more than one line and incremental expansions,
    28 like CVS' $Log$, are not supported. A keyword template map
    31 like CVS' $Log$, are not supported. A keyword template map
    29 "Log = {desc}" expands to the first line of the changeset description.
    32 "Log = {desc}" expands to the first line of the changeset description.
    30 Caveat: "hg import" fails if the patch context contains an active
    33 Caveat: "hg import" fails if the patch context contains an active
    31         keyword. In that case run "hg kwshrink", and then reimport.
    34         keyword. In that case run "hg kwshrink", and then reimport.
   119 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
   122 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
   120 do not process $Id:
   123 do not process $Id:
   121 xxx $
   124 xxx $
   122 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
   125 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
   123 tests for different changenodes
   126 tests for different changenodes
   124 % rollback and remove c
   127 % qimport
   125 rolling back last transaction
   128 % keywords should not be expanded in patch
       
   129 # HG changeset patch
       
   130 # User User Name <user@example.com>
       
   131 # Date 1 0
       
   132 # Node ID 7fefeeacf3596ca401a248c183c2314cbf4661ee
       
   133 # Parent  7f0665a496fd37c3627191bd02e26a1e230f2aa2
       
   134 cndiff
       
   135 
       
   136 diff -r 7f0665a496fd -r 7fefeeacf359 c
       
   137 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   138 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
       
   139 @@ -0,0 +1,2 @@
       
   140 +$Id$
       
   141 +tests for different changenodes
       
   142 % qpop
       
   143 Patch queue now empty
       
   144 % qpush
       
   145 applying mqtest.diff
       
   146 Now at: mqtest.diff
       
   147 % cat
       
   148 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
       
   149 tests for different changenodes
       
   150 % qpop and move on
       
   151 Patch queue now empty
   126 % copy
   152 % copy
   127 % kwfiles added
   153 % kwfiles added
   128 a
   154 a
   129 c
   155 c
   130 % commit
   156 % commit
   145 c
   171 c
   146 % diff --rev
   172 % diff --rev
   147 diff -r 7f0665a496fd c
   173 diff -r 7f0665a496fd c
   148 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   174 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   149 @@ -0,0 +1,3 @@
   175 @@ -0,0 +1,3 @@
   150 +expand $Id: c,v 6a127771f5db 1970/01/01 00:00:01 user $
   176 +expand $Id$
   151 +do not process $Id:
   177 +do not process $Id:
   152 +xxx $
   178 +xxx $
   153 % rollback
   179 % rollback
   154 rolling back last transaction
   180 rolling back last transaction
   155 % status
   181 % status