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".

#!/bin/sh

hg init a
cd a
cp $TESTDIR/binfile.bin .
hg add binfile.bin
hg ci -m 'add binfile.bin' -d '0 0'

echo >> binfile.bin
hg ci -m 'change binfile.bin' -d '0 0'

hg revert -r 0 binfile.bin
hg ci -m 'revert binfile.bin' -d '0 0'

echo % diff -r 0 -r 1
hg diff --nodates -r 0 -r 1

echo % diff -r 0 -r 2
hg diff --nodates -r 0 -r 2

echo % diff --git -r 0 -r 1
hg diff --git -r 0 -r 1

echo % diff --git -r 0 -r 2
hg diff --git -r 0 -r 2