是否有可能(重新)将hgsubversion连接到手动构建的存储库?

时间:2012-02-17 17:48:42

标签: mercurial hgsubversion

我正在使用一个存储库,其根目录已经在其历史记录中移动了一些(从trunk /开始,移动到子项目/主干)。现在我可以 使用hgsubversion来处理所有历史记录,直到它移动到子项目/主干(参见https://bitbucket.org/durin42/hgsubversion/issue/135/move-tracking),我可以使用hg convert或rebase将历史拼接到一个有凝聚力的存储库中。

在拼接并调用hg svn rebuildmeta之后,hgsubversion很困惑。 svn存储库中的新修订版被拉入名为“../”的分支。

基本上,我想知道是否可以告诉hgsubversion使用某个svn版本作为参考点,只是试图从那一点开始同步历史记录?

这是一个小问题,说明了这个问题(抱歉DOS命令)

C:\hgtest>svnadmin create svnrepo

C:\hgtest>svn co file:///C:/hgtest/svnrepo svncheckout
Checked out revision 0.

C:\hgtest>cd svncheckout

C:\hgtest\svncheckout>mkdir trunk/
The syntax of the command is incorrect.

C:\hgtest\svncheckout>svn mkdir trunk
A         trunk

C:\hgtest\svncheckout>cd trunk

C:\hgtest\svncheckout\trunk>echo "Test file version 1" > testfile.txt

C:\hgtest\svncheckout\trunk>cd ..

C:\hgtest\svncheckout>svn add trunk\testfile.txt
A         trunk\testfile.txt

C:\hgtest\svncheckout>svn ci -m "Original version in trunk configuration"
Adding         trunk
Adding         trunk\testfile.txt
Transmitting file data .
Committed revision 1.

C:\hgtest\svncheckout>svn mkdir subproject
A         subproject

C:\hgtest\svncheckout>svn mv trunk subproject
A         subproject\trunk
D         trunk
D         trunk\testfile.txt

C:\hgtest\svncheckout>svn ci -m "Moved trunk to subproject/trunk"
Adding         subproject
Adding         subproject\trunk
Deleting       trunk

Committed revision 2.

C:\hgtest\svncheckout>echo ". Adding some text to distinguish the subproject/trunk version of this file" >> subproject\trunk\testfile.txt

C:\hgtest\svncheckout>svn ci -m "Final version of testfile.txt"
Sending        subproject\trunk\testfile.txt
Transmitting file data .
Committed revision 3.

C:\hgtest\svncheckout>svn log subproject\trunk\testfile.txt
------------------------------------------------------------------------
r3 | kmahan | 2012-02-17 09:18:23 -0800 (Fri, 17 Feb 2012) | 1 line

Final version of testfile.txt
------------------------------------------------------------------------
r2 | kmahan | 2012-02-17 09:17:40 -0800 (Fri, 17 Feb 2012) | 1 line

Moved trunk to subproject/trunk
------------------------------------------------------------------------
r1 | kmahan | 2012-02-17 09:14:46 -0800 (Fri, 17 Feb 2012) | 1 line

Original version in trunk configuration
------------------------------------------------------------------------

C:\hgtest>hg clone svn://localhost:22222/subproject/trunk hgrepo
[r2] kmahan: Moved trunk to subproject/trunk
[r3] kmahan: Final version of testfile.txt
pulled 2 revisions
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

C:\hgtest>cd hgrepo

C:\hgtest\hgrepo>dir
 Volume in drive C is OSDisk
 Volume Serial Number is 74C7-4865

 Directory of C:\hgtest\hgrepo

02/17/2012  09:30 AM    <DIR>          .
02/17/2012  09:30 AM    <DIR>          ..
02/17/2012  09:30 AM    <DIR>          .hg
02/17/2012  09:30 AM               104 testfile.txt
               1 File(s)            104 bytes
               3 Dir(s)  1,705,932,423,168 bytes free

C:\hgtest\hgrepo>hg log --follow testfile.txt
changeset:   1:eae92a250a90
tag:         tip
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:18:23 2012 +0000
summary:     Final version of testfile.txt

changeset:   0:10c6ad198001
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:17:40 2012 +0000
summary:     Moved trunk to subproject/trunk


C:\hgtest>hg clone svn://localhost:22222/trunk -r 1 original-location
[r1] kmahan: Original version in trunk configuration
pulled 1 revisions
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved


C:\hgtest>cd hgrepo

C:\hgtest\hgrepo>hg pull -f ..\original-location
pulling from ..\original-location
searching for changes
warning: repository is unrelated
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)

C:\hgtest\hgrepo>hg log
changeset:   2:f968692b6301
tag:         tip
parent:      -1:000000000000
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:14:46 2012 +0000
summary:     Original version in trunk configuration

changeset:   1:eae92a250a90
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:18:23 2012 +0000
summary:     Final version of testfile.txt

changeset:   0:10c6ad198001
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:17:40 2012 +0000
summary:     Moved trunk to subproject/trunk


C:\hgtest\hgrepo>hg rebase -s 0 -d 2
saved backup bundle to C:\hgtest\hgrepo\.hg\strip-backup\10c6ad198001-backup.hg

C:\hgtest\hgrepo>hg log
changeset:   1:ee10af28394f
tag:         tip
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:18:23 2012 +0000
summary:     Final version of testfile.txt

changeset:   0:f968692b6301
user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
date:        Fri Feb 17 17:14:46 2012 +0000
summary:     Original version in trunk configuration

C:\hgtest\hgrepo>hg svn rebuildmeta

C:\hgtest\hgrepo>hg pull
pulling from svn://localhost:22222/subproject/trunk
[r2] kmahan: Moved trunk to subproject/trunk
Marked branch ../ as closed.
[r3] kmahan: Final version of testfile.txt
no changes found

C:\hgtest\hgrepo>echo "Here's some more text" >> testfile.txt

C:\hgtest\hgrepo>hg ci -m "Test commit from mercurial side"

C:\hgtest\hgrepo>hg glog
o  changeset:   5:a0e38c8fcfaf
|  branch:      ../
|  tag:         tip
|  user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
|  date:        Fri Feb 17 17:43:38 2012 +0000
|  summary:     Added new text from the svn side
|
o  changeset:   4:39fe2d8d743c
|  branch:      ../
|  parent:      0:f968692b6301
|  user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
|  date:        Fri Feb 17 17:18:23 2012 +0000
|  summary:     Final version of testfile.txt
|
| o  changeset:   3:4a494fcf85f1
|/   branch:      ../
|    parent:      0:f968692b6301
|    user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
|    date:        Fri Feb 17 17:17:40 2012 +0000
|    summary:     Moved trunk to subproject/trunk
|
| @  changeset:   2:547ed469c516
| |  user:        Kyle Mahan <kmahan@redacted.com>
| |  date:        Fri Feb 17 09:33:07 2012 -0800
| |  summary:     Test commit from mercurial side
| |
| o  changeset:   1:ee10af28394f
|/   user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
|    date:        Fri Feb 17 17:18:23 2012 +0000
|    summary:     Final version of testfile.txt
|
o  changeset:   0:f968692b6301
   user:        kmahan@b3f284a4-0405-ad4c-b974-dac5aa90a095
   date:        Fri Feb 17 17:14:46 2012 +0000
   summary:     Original version in trunk configuration

2 个答案:

答案 0 :(得分:2)

是的,但这将是一个手动过程。您需要为每个分支找到高水位标记修订版并将其记录在元数据文件中(此时其名称将从中逃脱)。在这一点上,事情应该最重要。

注意:这是一个理论。我很有信心它应该根据我对代码的记忆而工作,但我从未测试过它。

答案 1 :(得分:0)

  

基本上,我想知道是否可以告诉hgsubversion使用某个svn版本作为参考点,只是试图从那一点开始同步历史记录?

如果我理解正确,你需要--startrev选项克隆命令。来自hg help subversion

  

有时候,过去的存储库历史很少或者没有兴趣,并且   所有人都希望从今天开始并向前发展。运用   “--startrev HEAD”导致初始克隆仅转换最新的   修改;后来的拉动将转换所有后续修订。请   请注意,这仅适用于单目录克隆