Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-git-import.out @ 2901:05f357b70cb0
Tune a bit the extdiff toplevel comments/samples.
* Capitalize the first letter of all sentences
* Add an example for GNU diff(1) 'context diff' mode.
* Explain the requirement for separate cmd.xxx and opts.xxx
options in .hgrc, which hopefully will guard against users
trying to add:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff -Nprc5
which fails for recent crew builds with:
$ hg cdiff .
making snapshot of 1 files from rev 07dc4a569f4e
making snapshot of 1 files from working dir
diff -Nprc5: not found
The correct way to do this is by separating the cmd.cdiff and
opts.cdiff parts like this:
[extdiff]
# Add a new Mercurial command called `cdiff', which calls
# GNU diff(1) in 'context diff' mode.
cmd.cdiff = diff
opts.cdiff = -Nprc5
so add it as a new example and explicitly describe it in the
extdiff comments.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Tue, 15 Aug 2006 18:14:58 +0300 |
parents | e2b69dbb2daa |
children | b70740aefa4d |
rev | line source |
---|---|
2863 | 1 % new file |
2 applying patch from stdin | |
3 patching file new | |
4 % chmod +x | |
5 applying patch from stdin | |
6 % copy | |
7 applying patch from stdin | |
8 a | |
9 a | |
10 % rename | |
11 applying patch from stdin | |
12 copyx | |
13 new | |
14 rename | |
15 % delete | |
16 applying patch from stdin | |
17 patching file copyx | |
18 new | |
19 rename | |
20 % regular diff | |
21 applying patch from stdin | |
22 patching file rename | |
23 % copy and modify | |
24 applying patch from stdin | |
25 patching file copy2 | |
26 a | |
27 a | |
28 b | |
29 a | |
30 a | |
31 % rename and modify | |
32 applying patch from stdin | |
33 patching file rename2 | |
34 copy2: No such file or directory | |
35 a | |
36 a | |
37 b | |
38 c | |
39 a |