##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r8126:13b36eb1 default
r10276:6109a02c merge default
Show More
test-convert-bzr-114
30 lines | 620 B | text/plain | TextLexer
/ tests / test-convert-bzr-114
#!/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 ../..