##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Stefano Tortarolo - - Load All Authors

File last commit:

r7954:b9696110 default
r9725:3f522d2f default
Show More
test-rebase-rename.out
40 lines | 688 B | text/plain | TextLexer
/ tests / test-rebase-rename.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
rebase: don't lose rename/copy data (Issue1423)
 r7954 adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Rename is tracked
2:rename A
diff --git a/a b/a-renamed
rename from a
rename to a-renamed
% Rebase the revision containing the rename
saving bundle to
% Rename is not lost
2:rename A
diff --git a/a b/a-renamed
rename from a
rename to a-renamed
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Copy is tracked
2:copy A
diff --git a/a b/a-copied
copy from a
copy to a-copied
% Rebase the revision containing the copy
saving bundle to
% Copy is not lost
2:copy A
diff --git a/a b/a-copied
copy from a
copy to a-copied