view tests/test-symlink-basic.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.

abort: dangling: file not tracked!
changeset:   0:cabd88b706fc
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       dangling
description:
add symlink


2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling
% rev 0:
dangling -> nothing
% rev 1:
dangling -> void
% modifying link
dangling -> empty
% reverting to rev 0:
reverting dangling
dangling -> nothing
% backups:
dangling.orig -> empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% copies
copying dangling to dangling2
A dangling2
  dangling
dangling -> void
dangling2 -> void
% issue995
0 files updated, 0 files merged, 0 files removed, 0 files unresolved