Mercurial > hg
diff tests/test-mq-qdiff.out @ 9725:3f522d2fa633
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
author | Yannick Gingras <ygingras@ygingras.net> |
---|---|
date | Thu, 05 Nov 2009 15:18:56 +0100 |
parents | 561ff8d9e4f0 |
children | 4fe9ca519637 |
line wrap: on
line diff
--- a/tests/test-mq-qdiff.out Thu Nov 05 15:06:35 2009 +0100 +++ b/tests/test-mq-qdiff.out Thu Nov 05 15:18:56 2009 +0100 @@ -76,7 +76,7 @@ +hello world + goodbye world 7 -qdiff -w +% qdiff -w diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -86,3 +86,21 @@ 1 2 3 +% qdiff --inverse +diff -r 35fb829491c1 lines +--- a/lines ++++ b/lines +@@ -1,11 +1,9 @@ +- +- + 1 + 2 + 3 + 4 +-hello world +- goodbye world ++hello world ++goodbye world + 7 + 8 + 9