view tests/test-audit-path @ 12382:28ddf67198b2 stable

log: include unmodified-in-merge files in log diff/stat (issue2383)

f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.

This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...

#!/bin/sh

hg init

echo % should fail
hg add .hg/00changelog.i

mkdir a
echo a > a/a
hg ci -Ama
ln -s a b
echo b > a/b

echo % should fail
hg add b/b

echo % should succeed
hg add b

echo % should still fail - maybe
hg add b/b

echo % unbundle tampered bundle
hg init target
cd target
hg unbundle $TESTDIR/tampered.hg

echo % attack .hg/test
hg manifest -r0
hg update -Cr0

echo % attack foo/.hg/test
hg manifest -r1
hg update -Cr1

echo % attack back/test where back symlinks to ..
hg manifest -r2
hg update -Cr2

echo % attack ../test
hg manifest -r3
hg update -Cr3

echo % attack /tmp/test
hg manifest -r4
hg update -Cr4 2>&1 | sed -e "s|/.*/test-audit-path|[HGTMP]/test-audit-path|"

exit 0