Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-git-export.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 | 8b02af865990 |
children | 035fd2029575 |
rev | line source |
---|---|
2892 | 1 adding start |
2 adding new | |
3 % new file | |
4 diff --git a/new b/new | |
5 new file mode 100644 | |
6 --- /dev/null | |
7 +++ b/new | |
8 @@ -0,0 +1,1 @@ | |
9 +new | |
10 % copy | |
11 diff --git a/new b/copy | |
12 copy from new | |
13 copy to copy | |
14 % rename | |
15 diff --git a/copy b/rename | |
16 rename from copy | |
17 rename to rename | |
18 % delete | |
19 diff --git a/rename b/rename | |
20 deleted file mode 100644 | |
21 --- a/rename | |
22 +++ /dev/null | |
23 @@ -1,1 +0,0 @@ | |
24 -new | |
25 adding src | |
26 % chmod 644 | |
27 diff --git a/src b/src | |
28 old mode 100644 | |
29 new mode 100755 | |
30 % rename+mod+chmod | |
31 diff --git a/src b/dst | |
32 old mode 100755 | |
33 new mode 100644 | |
34 rename from src | |
35 rename to dst | |
36 --- a/dst | |
37 +++ b/dst | |
38 @@ -3,3 +3,4 @@ 3 | |
39 3 | |
40 4 | |
41 5 | |
42 +a |