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

% create test repository
adding a
adding b
adding c
% churn separate directories
user1      1 ***************************************************************
% churn all
user3      3 ***************************************************************
user1      3 ***************************************************************
user2      2 ******************************************
% churn up to rev 2
user2      2 ***************************************************************
user1      1 ********************************
% churn with aliases
alias3      3 **************************************************************
alias1      3 **************************************************************
user2       2 *****************************************
% churn with .hgchurn
alias3      3 **************************************************************
alias1      3 **************************************************************
user2       2 *****************************************
% churn with column specifier
user3      3 ***********************
user1      3 ***********************
user2      2 ***************
% churn by hour
06      1 *****************
09      2 *********************************
12      4 ******************************************************************
13      1 *****************
% churn with separated added/removed lines
user1           +3/-1 +++++++++++++++++++++++++++++++++++++++++--------------
user3           +3/-0 +++++++++++++++++++++++++++++++++++++++++
user2           +2/-0 +++++++++++++++++++++++++++
% changeset number churn
user1      4 ***************************************************************
user3      3 ***********************************************
user2      2 ********************************
adding foo
test      0