Mercurial > hg
view tests/test-convert-bzr-directories.out @ 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 | 209ef5f3534c |
children |
line wrap: on
line source
% empty directory initializing destination source-hg repository scanning source... sorting... converting... 2 Initial add 1 Empty directory added 0 Added file into directory % manifest of 1 644 a % manifest of tip 644 a 644 empty/something % directory renames tpyo => typo initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Oops, typo % manifest of 0 644 tpyo/something % manifest of tip 644 typo/something % nested directory renames firstlevel/secondlevel => secondlevel initializing destination source-hg repository scanning source... sorting... converting... 1 Added nested directories 0 Moved secondlevel one level up % manifest of tip 644 secondlevel/file 644 secondlevel/thirdlevel/stuff % directory remove initializing destination source-hg repository scanning source... sorting... converting... 1 Added directory 0 Removed directory % manifest of 0 644 src/sourcecode % manifest of tip % directory replace first/file => second/file first => third initializing destination source-hg repository scanning source... sorting... converting... 1 Initial layout 0 Some conflicting moves % manifest of tip 644 second/file 644 second/something 644 third/dummy