tests/test-bundle-type
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6640 d6b53b48943f
child 7171 41b7802b089a
permissions -rwxr-xr-x
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

#!/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
  head -n 1 ../b$t | cut -b 1-6
  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 ..