Mercurial > hg
view tests/test-convert-hg-svn.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 | 0750f11152fe |
children | ea26ac58bbe3 |
line wrap: on
line source
Checked out revision 0. A a Adding a Transmitting file data . Committed revision 1. % initial roundtrip scanning source... sorting... converting... 0 added a scanning source... sorting... converting... % second roundtrip should do nothing scanning source... sorting... converting... scanning source... sorting... converting... % new hg rev updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo hg to svn scanning source... sorting... converting... 0 b % svn back to hg should do nothing scanning source... sorting... converting... % hg back to svn should do nothing scanning source... sorting... converting...