view tests/test-convert-svn-tags.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.

% convert
initializing destination A-hg repository
scanning source...
sorting...
converting...
5 init projA
4 adda
3 changea
2 changea2
1 changea3
0 changea
updating tags
o  6 update tags tags: tip
|
o  5 changea tags: trunk.goodtag
|
o  4 changea3 tags:
|
o  3 changea2 tags: trunk.v1
|
o  2 changea tags:
|
o  1 adda tags:
|
o  0 init projA tags:

tip                                6:
trunk.goodtag                      5:
trunk.v1                           3:
% convert without tags
initializing destination A-notags-hg repository
scanning source...
sorting...
converting...
5 init projA
4 adda
3 changea
2 changea2
1 changea3
0 changea
tip