equal
deleted
inserted
replaced
37 "hg kwexpand". |
37 "hg kwexpand". |
38 |
38 |
39 Expansions spanning more than one line and incremental expansions, |
39 Expansions spanning more than one line and incremental expansions, |
40 like CVS' $Log$, are not supported. A keyword template map |
40 like CVS' $Log$, are not supported. A keyword template map |
41 "Log = {desc}" expands to the first line of the changeset description. |
41 "Log = {desc}" expands to the first line of the changeset description. |
42 |
|
43 Caveat: "hg import" fails if the patch context contains an active |
|
44 keyword. In that case run "hg kwshrink", and then reimport. |
|
45 Or, better, use bundle/unbundle to share changes. |
|
46 |
42 |
47 list of commands: |
43 list of commands: |
48 |
44 |
49 kwdemo print [keywordmaps] configuration and an expansion example |
45 kwdemo print [keywordmaps] configuration and an expansion example |
50 kwexpand expand keywords in working directory |
46 kwexpand expand keywords in working directory |
262 tag: tip |
258 tag: tip |
263 user: User Name <user@example.com> |
259 user: User Name <user@example.com> |
264 date: Thu Jan 01 00:00:02 1970 +0000 |
260 date: Thu Jan 01 00:00:02 1970 +0000 |
265 summary: firstline |
261 summary: firstline |
266 |
262 |
|
263 % commit conflicttest |
|
264 a |
|
265 overwriting a expanding keywords |
|
266 % export |
|
267 % import |
|
268 applying ../conflicttest.diff |
|
269 % cat |
|
270 expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest |
|
271 do not process $Id: conflicttest |
|
272 xxx $ |
|
273 $Xinfo: User Name <user@example.com>: conflict? $ |
|
274 expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest |
|
275 do not process $Id: conflicttest |
|
276 xxx $ |
|
277 $Xinfo: User Name <user@example.com>: conflict? $ |
|
278 ignore $Id$ |
|
279 |
|
280 % rollback |
|
281 rolling back last transaction |
|
282 % clean update |
|
283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
267 % kwexpand/kwshrink on selected files |
284 % kwexpand/kwshrink on selected files |
268 % copy a x/a |
285 % copy a x/a |
269 % kwexpand a |
286 % kwexpand a |
270 overwriting a expanding keywords |
287 overwriting a expanding keywords |
271 % kwexpand x/a should abort |
288 % kwexpand x/a should abort |