Mercurial > hg
view tests/test-inotify @ 9725:3f522d2fa633
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.
author | Yannick Gingras <ygingras@ygingras.net> |
---|---|
date | Thu, 05 Nov 2009 15:18:56 +0100 |
parents | a87bc6e2a907 |
children | 95e1867f765b |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" inotify || exit 80 hg init touch a b c d e mkdir dir mkdir dir/bar touch dir/x dir/y dir/bar/foo hg ci -Am m echo "[extensions]" >> $HGRCPATH echo "inotify=" >> $HGRCPATH echo % inserve hg inserve -d --pid-file=hg.pid cat hg.pid >> "$DAEMON_PIDS" # let the daemon finish its stuff sleep 1 # issue907 hg status echo % clean hg status -c echo % all hg status -A echo '% path patterns' echo x > dir/x hg status . hg status dir cd dir hg status . cd .. #issue 1375 #Testing that we can remove a folder and then add a file with the same name echo % issue 1375 mkdir h echo h > h/h hg ci -Am t hg rm h echo h >h hg add h hg status hg ci -m0 # Test for issue1735: inotify watches files in .hg/merge hg st echo a > a hg ci -Am a hg st echo b >> a hg ci -m ab hg st echo c >> a hg st hg up 0 hg st HGMERGE=internal:local hg up hg st kill `cat hg.pid`