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

% add file
adding qqq.txt
% commit first revision
% set bookmark
% commit second revision
% set bookmark
% update to -2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit new head
created new head
% bookmarks updated?
   test                      1:16b24da7e457
   test2                     1:16b24da7e457
% strip to revision 1
saving bundle to 
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
% list bookmarks
 * test                      1:9f1b7e78eff8
 * test2                     1:9f1b7e78eff8