view tests/test-issue1306 @ 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

echo % initialize remote repo with branches
hg init remote
cd remote
echo a > a
hg ci -Ama
hg branch br
hg ci -Amb
echo c > c
hg ci -Amc
hg log

cd ..
echo % try cloning -r branch
hg clone -rbr remote local1
hg -R local1 parents

echo % try cloning -rother clone#branch
hg clone -r0 remote#br local2
hg -R local2 parents

echo % try cloning -r1 clone#branch
hg clone -r1 remote#br local3
hg -R local3 parents