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

% initialize remote repo with branches
adding a
marked working directory as branch br
adding c
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch br
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

% try cloning -rother clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r1 clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating to branch br
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b