Mercurial > hg
diff tests/test-convert-bzr-114.t @ 12513:d1f88ae495b4
tests: unify test-convert-bzr-114
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 14:35:43 -0500 |
parents | tests/test-convert-bzr-114@13b36eb14324 |
children | 7a9cbb315d84 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-bzr-114.t Sun Sep 26 14:35:43 2010 -0500 @@ -0,0 +1,39 @@ + + $ "$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. +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 + initializing destination source-hg repository + scanning source... + sorting... + converting... + 2 add d file + 1 replace with d dir + 0 add d/a + $ manifest source-hg tip + % manifest of tip + 644 d/a + $ cd source-hg + $ hg update + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd ../..