Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-excessive-merge.out @ 2549:e1831f06eef1
Added ability to clone from a local repository to a (new) remote one.
Rearranged the clone command a good bit to make sure it validates that
the source does exist and that the destination doesn't before doing anything.
Before I moved the source repo check it would create the destination
repository before it verified the source existed.
Moved the responsibility for creating the destination repo root directory
entirly into the localrepo class so that local to local cloning doesn't break.
This also simplifies the code a bit since it's no longer being done in both
clone and init.
Changed the names of the 'repo' and 'other' variables to 'dest_repo' and
'src_repo' to maintain my sanity.
Passes 82/83 tests. The only failure is the version number test, which I
suspect is supposed to fail since it comes from a generated file.
author | Sean Meiners <sean.meiners@linspire.com> |
---|---|
date | Fri, 30 Jun 2006 19:24:02 -0700 |
parents | b2ae81a7df29 |
children | 8feb33c2d153 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) changeset: 4:f6c172c6198c tag: tip parent: 1:448a8c5e42f1 parent: 2:7c5dc2e857f2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: merge a/b -> blah changeset: 3:13d875a22764 parent: 2:7c5dc2e857f2 parent: 1:448a8c5e42f1 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: merge b/a -> blah changeset: 2:7c5dc2e857f2 parent: 0:dc1751ec2e9d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: branch b changeset: 1:448a8c5e42f1 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: branch a changeset: 0:dc1751ec2e9d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: test rev offset length base linkrev nodeid p1 p2 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 1 79d7492df40aa0fa093ec4209be78043c181f094 644 a 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b 2 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 b 3 79d7492df40aa0fa093ec4209be78043c181f094 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 b 4 79d7492df40aa0fa093ec4209be78043c181f094 644 a 79d7492df40aa0fa093ec4209be78043c181f094 644 b rev offset length base linkrev nodeid p1 p2 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 5 changesets, 4 total revisions