view tests/test-bundle-type @ 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 % bundle w/o type option
hg init t1
hg init t2
cd t1
echo blablablablabla > file.txt
hg ci -Ama
hg log | grep summary
hg bundle ../b1 ../t2

cd ../t2
hg pull ../b1
hg up
hg log | grep summary
cd ..

for t in "None" "bzip2" "gzip"; do
  echo % test bundle type $t
  hg init t$t
  cd t1
  hg bundle -t $t ../b$t ../t$t
  cut -b 1-6 ../b$t | head -n 1
  cd ../t$t
  hg pull ../b$t
  hg up
  hg log | grep summary
  cd ..
done

echo % test garbage file
echo garbage > bgarbage
hg init tgarbage
cd tgarbage
hg pull ../bgarbage
cd ..

echo % test invalid bundle type
cd t1
hg bundle -a -t garbage ../bgarbage
cd ..