Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-extdiff @ 5440:f9b0e4f023c4
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
parents | 797c6e70092b |
children | 2be225ea5722 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "extdiff=" >> $HGRCPATH hg init a cd a echo a > a hg add hg extdiff -o -r $opt echo "[extdiff]" >> $HGRCPATH echo "cmd.falabala=echo" >> $HGRCPATH echo "opts.falabala=diffing" >> $HGRCPATH hg falabala hg help falabala hg ci -d '0 0' -mtest1 echo b >> a hg ci -d '1 0' -mtest2 hg falabala -r 0:1 # test diff during merge hg update 0 echo b >> b hg add b hg ci -m "new branch" -d '1 0' hg update -C 1 hg merge tip hg falabala || echo "diff-like tools yield a non-zero exit code"