##// 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:

r5051:e3dffbdc default
r9725:3f522d2f default
Show More
test-issue322.out
12 lines | 372 B | text/plain | TextLexer
/ tests / test-issue322.out
Vadim Gelfer
fix issue 322....
r2953 % file replaced with directory
adding a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: file 'a' in dirstate clashes with 'a/a'
Vadim Gelfer
fix issue 322....
r2953 % directory replaced with file
adding a/a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: directory 'a' already in dirstate
Vadim Gelfer
fix issue 322....
r2953 % directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: directory 'b' already in dirstate