view tests/test-convert-svn-move.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 trunk and branches
initializing destination A-hg repository
scanning source...
sorting...
converting...
11 createtrunk
10 moved1
9 moved1
8 moved2
7 changeb and rm d2
6 changeb and rm d2
5 moved1again
4 moved1again
3 copyfilefrompast
2 copydirfrompast
1 add d3
0 copy dir and remove subdir
o  11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f
|
o  10 add d3 files: d3/d31/e d3/f
|
o  9 copydirfrompast files: d2/d
|
o  8 copyfilefrompast files: d
|
o  7 moved1again files: d1/b d1/c
|
| o  6 moved1again files:
| |
o |  5 changeb and rm d2 files: d1/b d2/d
| |
| o  4 changeb and rm d2 files: b
| |
o |  3 moved2 files: d2/d
| |
o |  2 moved1 files: d1/b d1/c
| |
| o  1 moved1 files: b c
|
o  0 createtrunk files:

default                       11:
d1                             6: