view tests/test-bookmarks-current.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.

% no bookmarks
no bookmarks set
% set bookmark X
% list bookmarks
 * X                         -1:000000000000
% update to bookmark X
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% list bookmarks
 * X                         -1:000000000000
% rename
% list bookmarks
 * Z                         -1:000000000000
% new bookmark Y
% list bookmarks
 * Y                         -1:000000000000
   Z                         -1:000000000000
% commit
% list bookmarks
 * Y                         0:719295282060
   Z                         -1:000000000000
% delete bookmarks
% list bookmarks
no bookmarks set
% update to tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved