Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-init.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 75dcfe28da4a |
children | b2d9e553cdc8 |
line wrap: on
line source
# creating 'local' adding foo #test failure abort: repository local already exists! # init+push to remote2 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 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg init remote1 3: 4: 5: Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio 3: 4: 5: Got arguments 1:user@dummy 2:hg init remote1 3: 4: 5: Got arguments 1:user@dummy 2:hg init remote1 3: 4: 5: # 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