Mercurial > hg
view tests/test-init.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 | 671b3e1eac2e |
children | c3e8ab80ee90 |
line wrap: on
line source
# creating 'local' store created 00changelog.i created revlogv1 store fncache adding foo # creating repo with format.usestore=false revlogv1 # creating repo with format.usefncache=false store created 00changelog.i created revlogv1 store #test failure abort: repository local already exists! # init+push to remote2 comparing with local changeset: 0:c4e059d443be tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: init pushing to ssh://user@dummy/remote2 searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files # clone to remote1 searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files # init to existing repo abort: repository remote1 already exists! abort: could not create remote repo! # clone to existing repo abort: repository remote1 already exists! abort: could not create remote repo! # output of dummyssh Got arguments 1:user@dummy 2:hg init remote2 Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio Got arguments 1:user@dummy 2:hg init remote1 Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio Got arguments 1:user@dummy 2:hg init remote1 Got arguments 1:user@dummy 2:hg init remote1 # comparing repositories 0:c4e059d443be 0:c4e059d443be 0:c4e059d443be # check names for repositories (clashes with URL schemes, special chars) # hg init "bundle" ok # hg init "file" ok # hg init "hg" ok # hg init "http" ok # hg init "https" ok # hg init "old-http" ok # hg init "ssh" ok # hg init "static-http" ok # hg init " " ok # hg init "with space" ok