Mercurial > hg
view tests/test-push-http.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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | a3d73b3e1f8a |
children | ace3cf2bc991 |
line wrap: on
line source
adding a updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost/ searching for changes ssl required % serve errors % expect authorization error abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect authorization error: must have authorized user abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect success pushing to http://localhost/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files % serve errors changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http rolling back last transaction % expect authorization error: all users denied abort: authorization failed pushing to http://localhost/ searching for changes % serve errors % expect authorization error: some users denied, users must be authenticated abort: authorization failed pushing to http://localhost/ searching for changes % serve errors