Mercurial > hg
annotate tests/test-diff-reverse.out @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
parents | tests/test-diff-inverse.out@3f522d2fa633 |
children |
rev | line source |
---|---|
9725
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
1 adding a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
2 diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
3 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
4 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
5 @@ -1,3 +1,3 @@ |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
6 -d |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
7 -e |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
8 -f |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
9 +a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
10 +b |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
11 +c |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
12 diff -r 2855cdcfcbb7 a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
13 --- a/a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
14 +++ b/a |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
15 @@ -1,5 +1,3 @@ |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
16 d |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
17 e |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
18 f |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
19 -g |
3f522d2fa633
diff: add --inverse option
Yannick Gingras <ygingras@ygingras.net>
parents:
diff
changeset
|
20 -h |