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

% wide diffstat
 a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 213 insertions(+), 0 deletions(-)
% diffstat width
 a |  213 ++++++++++++++
 1 files changed, 213 insertions(+), 0 deletions(-)
% narrow diffstat
 a |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
% binary diffstat
 b |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)
% binary git diffstat
 b |  Bin 
 1 files changed, 0 insertions(+), 0 deletions(-)