Mercurial > hg
view tests/test-convert-bzr-directories @ 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 | 9e6d6568bf7a |
children |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" echo % empty directory mkdir test-empty cd test-empty bzr init -q source cd source echo content > a bzr add -q a bzr commit -q -m 'Initial add' mkdir empty bzr add -q empty bzr commit -q -m 'Empty directory added' echo content > empty/something bzr add -q empty/something bzr commit -q -m 'Added file into directory' cd .. hg convert source source-hg manifest source-hg 1 manifest source-hg tip cd .. echo % directory renames mkdir test-dir-rename cd test-dir-rename bzr init -q source cd source mkdir tpyo echo content > tpyo/something bzr add -q tpyo bzr commit -q -m 'Added directory' bzr mv tpyo typo bzr commit -q -m 'Oops, typo' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % nested directory renames mkdir test-nested-dir-rename cd test-nested-dir-rename bzr init -q source cd source mkdir -p firstlevel/secondlevel/thirdlevel echo content > firstlevel/secondlevel/file echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff bzr add -q firstlevel bzr commit -q -m 'Added nested directories' bzr mv firstlevel/secondlevel secondlevel bzr commit -q -m 'Moved secondlevel one level up' cd .. hg convert source source-hg manifest source-hg tip cd .. echo % directory remove mkdir test-dir-remove cd test-dir-remove bzr init -q source cd source mkdir src echo content > src/sourcecode bzr add -q src bzr commit -q -m 'Added directory' bzr rm -q src bzr commit -q -m 'Removed directory' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % directory replace mkdir test-dir-replace cd test-dir-replace bzr init -q source cd source mkdir first second echo content > first/file echo morecontent > first/dummy echo othercontent > second/something bzr add -q first second bzr commit -q -m 'Initial layout' bzr mv first/file second/file bzr mv first third bzr commit -q -m 'Some conflicting moves' cd .. hg convert source source-hg manifest source-hg tip cd ..