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

adding a
marked working directory as branch brancha
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch branchb
adding b
created new head
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% convert with datesort
initializing destination t-datesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 a4
3 b0
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
o |  5 "b0"
| |
| o  4 "a4"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"

% convert with datesort (default mode)
initializing destination t-sourcesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 b0
3 a4
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
| o  5 "a4"
| |
o |  4 "b0"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"