##// 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.
Martin Geisler - - Load All Authors

File last commit:

r8168:8766fee6 default
r9725:3f522d2f default
Show More
test-bookmarks-rebase
38 lines | 582 B | text/plain | TextLexer
/ tests / test-bookmarks-rebase
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH
cleanoutput () {
sed -e 's/\(Rebase status stored to\).*/\1/' \
-e 's/\(Rebase status restored from\).*/\1/' \
-e 's/\(saving bundle to \).*/\1/'
}
echo % initialize repository
hg init
echo 'a' > a
hg ci -A -m "0"
echo 'b' > b
hg ci -A -m "1"
hg up 0
echo 'c' > c
hg ci -A -m "2"
echo 'd' > d
hg ci -A -m "3"
hg bookmark -r 1 one
hg bookmark -r 3 two
echo % bookmark list
hg bookmark
echo % rebase
hg rebase -s two -d one 2>&1 | cleanoutput
hg log