Mercurial > public > mercurial-scm > hg
diff tests/test-convert-bzr-114 @ 8126:13b36eb14324
convert/bzr: handle files replaced by directories (issue1623)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 23 Apr 2009 15:07:05 +0200 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-bzr-114 Thu Apr 23 15:07:05 2009 +0200 @@ -0,0 +1,30 @@ +#!/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 ../..