Mercurial > hg
view tests/test-convert-mtn-rename-directory.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 | 88a2687fbd38 |
children |
line wrap: on
line source
% tedious monotone keys configuration % create monotone repository mtn: adding dir1 to workspace manifest mtn: adding dir1/subdir1 to workspace manifest mtn: adding dir1/subdir1/file1 to workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8 % rename directory mtn: skipping dir1, already accounted for in workspace mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b % convert assuming destination repo.mtn-hg initializing destination repo.mtn-hg repository scanning source... sorting... converting... 1 initialize 0 rename 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % manifest dir1/subdir2/file1