我对 mercurial 很陌生,我已经阅读了很多关于这个主题的主题,但我仍然不明白我是否能实现我想要做的事情。
基本上,我有兴趣在单个命令中从主存储库及其子存储库中克隆当前版本的分支(作用于主存储库)。我稍后会尝试更好地解释它。
假设我将代码分成模块(下面的示例中只有一个模块)。我希望每个模块都在自己的存储库中,并有一个主存储库(具有 .hgsub 的那个)作为粘合剂来保持所有子存储库的位置。主存储库仅包含 .hgsub 和一个脚本,该脚本 (1)hg archive
预定义目录中的每个子存储库和 (2) 执行代码的源外构建。所有开发、提交、推送、拉取、合并都在各个子存储库中完成。
# create a module (subrepo of the master)
hg init subrepo
cd subrepo/
echo "a file" > aFile.c
echo "another file" > anotherFile.txt
hg add
hg ci -m "initial rev of subrepo"
# create the main (master) repo & add the reference to subrepo
cd ../
hg init main
cd main
hg clone ../subrepo subrepo
echo subrepo = ../subrepo > .hgsub
echo hg archive and out-of-source build > build.script
hg add
hg ci -m "initial rev of main repo"
到目前为止,一切都很好。如果我hg clone main
得到 subrepo 的默认分支的当前版本,如预期的那样。
但是,现在让我们想象一下,我已经准备好将我的代码发布到一个版本中:1.0.0。我会做如下。
# create the branch 1.0 to manage the bug fixes to 1.0.0 and furthers
cd ../subrepo/
hg branch 1.0
hg ci -m "creating the branch 1.0"
# backstep to the main line to carry on the development of new features
hg up default
echo "working in the main line" > aNewFeature.c
hg add
hg ci -m "carrying on the development in the main line (a new feature)"
hg glog
@ changeset: 2:c499329c2729
| tag: tip
| parent: 0:50d4522a99ea
| user: XXXX
| date: Tue Dec 07 16:13:28 2010 +0100
| summary: carrying on the development in the main line (a new feature)
|
| o changeset: 1:0a81043e6e8a
|/ branch: 1.0
| user: XXXX
| date: Tue Dec 07 16:12:02 2010 +0100
| summary: creating the branch 1.0
|
o changeset: 0:50d4522a99ea
user: XXXX
date: Tue Dec 07 15:52:57 2010 +0100
summary: initial rev of subrepo
这就是问题发生的地方。当我执行时,如何更改主存储库以获取默认的当前版本,或者最终获取子存储库的 1.0 分支hg clone
?
我会说这行得通。
# replicate the branch structure also in the main repo
cd ../main/
hg branch 1.0
echo subrepo = ../subrepo -r 1.0 > .hgsub
hg ci -m "adding -r 1.0 to .hgsub"
hg up default
echo subrepo = ../subrepo -r default > .hgsub
hg ci -m "adding -r default to .hgsub"
hg glog
@ changeset: 2:f97c90a31a21
| tag: tip
| parent: 0:1fd6b5d528b4
| user: XXXX
| date: Tue Dec 07 16:22:05 2010 +0100
| summary: adding -r default to .hgsub
|
| o changeset: 1:3d9ed2f8b026
|/ branch: 1.0
| user: XXXX
| date: Tue Dec 07 16:21:32 2010 +0100
| summary: adding -r 1.0 to .hgsub
|
o changeset: 0:1fd6b5d528b4
user: XXXX
date: Tue Dec 07 15:55:53 2010 +0100
summary: initial rev of main repo
但是当我hg clone
主要回购时,我得到
cd /a/directory
hg clone /path/to/main -r 1.0 main
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 3 changes to 2 files
updating to branch 1.0
pulling subrepo subrepo
abort: HTTP Error 404: Not Found
有没有办法实现我想做的事情?
谢谢。
快速更新:在我发布问题一分钟后,我找到了一个我以前从未见过的答案。在那里,建议使用以下语法
http://[user[:pass]@]host[:port]/[path][#revision]
通过使用#branchname
代替#revision
. 因此,在我的示例中,以下内容应该有效(对于分支 1.0):
echo subrepo = ../subrepo#1.0 > .hgsub
但是当我hg clone
得到主仓库时:
pulling subrepo subrepo
abort: unsupported URL component: "1.0"
Exception AttributeError: "'httprepository' object has no attribute 'urlopener'" in <bound method httprepository.__del__ of <mercurial.httprepo.httprepository object at 0x871332c>> ignored
我正在开发 Ubuntu 10.04,mercurial 1.4.3-1。建议?
——迪伦