##// END OF EJS Templates
diff: add --inverse option...
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.

File last commit:

r8167:6c82beaa default
r9725:3f522d2f default
Show More
test-issue672
35 lines | 392 B | text/plain | TextLexer
#!/bin/sh
# 0-2-4
# \ \ \
# 1-3-5
#
# rename in #1, content change in #4.
hg init t
cd t
touch 1
touch 2
hg commit -Am init # 0
hg rename 1 1a
hg commit -m rename # 1
hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 # 2
hg merge --debug 1
hg ci -m merge1 # 3
hg co -C 2
echo hello >> 1
hg ci -m unrelated2 # 4
hg co -C 3
hg merge -y --debug 4
hg co -C 4
hg merge -y --debug 3