Mercurial > hg
view tests/test-convert-bzr-114 @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
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 ../..