view tests/test-empty-file.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.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
changeset:   2:62ec0e86d1e5
tag:         tip
parent:      0:567dde5e6e98
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty3

changeset:   1:41ab7b321727
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty2

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3