Mercurial > hg
view tests/test-convert-bzr-114 @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | 13b36eb14324 |
children |
line wrap: on
line source
#!/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 ../..