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

r8168:8766fee6 default
r9725:3f522d2f default
Show More
test-merge10
33 lines | 640 B | text/plain | TextLexer
#!/bin/sh
# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
# (merge correctly when all the files in a directory are moved
# but then local changes are added in the same directory)
hg init a
cd a
mkdir -p testdir
echo a > testdir/a
hg add testdir/a
hg commit -d '1000000 0' -m a
cd ..
hg clone a b
cd a
echo alpha > testdir/a
hg commit -d '1000000 0' -m remote-change
cd ..
cd b
mkdir testdir/subdir
hg mv testdir/a testdir/subdir/a
hg commit -d '1000000 0' -m move
mkdir newdir
echo beta > newdir/beta
hg add newdir/beta
hg commit -d '1000000 0' -m local-addition
hg pull ../a
hg up -C 2
hg merge
hg stat
hg diff --nodates