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

marked working directory as branch æ
adding foo
listening at http://localhost/ (bound to 127.0.0.1)
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   0:867c11ce77b8
branch:      æ
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     foo

pushing to http://localhost:PORT
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
changeset:   1:58e7c90d67cb
branch:      æ
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     bar

changeset:   0:867c11ce77b8
branch:      æ
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     foo