view tests/test-convert-bzr-114 @ 9241:d98cef25b5af

Merge with crew-stable

#!/bin/sh

"$TESTDIR/hghave" bzr114 || exit 80

. "$TESTDIR/bzr-definitions"

# The file/directory replacement can only be reproduced on
# bzr >= 1.4. Merge it back in test-convert-bzr-directories once
# this version becomes mainstream.
echo % replace file with dir
mkdir test-replace-file-with-dir
cd test-replace-file-with-dir
bzr init -q source
cd source
echo d > d
bzr add -q d
bzr commit -q -m 'add d file'
rm d
mkdir d
bzr add -q d
bzr commit -q -m 'replace with d dir'
echo a > d/a
bzr add -q d/a
bzr commit -q -m 'add d/a'
cd ..
hg convert source source-hg
manifest source-hg tip
cd source-hg
hg update
cd ../..