view tests/test-mq-symlinks.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.

a -> a not a symlink
% test replacing a file with a symlink
a -> b
popping symlink.patch
now at: base.patch
applying symlink.patch
now at: symlink.patch
a -> b
% test updating a symlink
a -> c
popping updatelink
now at: symlink.patch
applying updatelink
patching file a
a
now at: updatelink
a -> c
% test replacing a symlink with a file
popping replacelinkwithfile
now at: addlink
applying replacelinkwithfile
now at: replacelinkwithfile
sss
% test symlink removal
popping removesl.patch
now at: replacelinkwithfile
applying removesl.patch
now at: removesl.patch
C b
C c
C s