view tests/test-bundle-type @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/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 ..