Mercurial 存储库作为 SVN 的包装器
对于开发，我们使用 Mercurial 存储库作为 SVN 存储库的包装器，以便在项目中进行代码审查。一切工作正常：开发人员正在获取更改并将自己的更改提交到 Mercurial 存储库中，项目团队负责人有时会将更改从 Mercurial 服务器存储库推送到 SVN 服务器存储库。
但我们遇到了一个问题。有一天，两名开发人员推送了两个变更集。为了将其推送到服务器，他们合并了所有更改并推送到服务器。一切都很好，但此后我们无法将更改从 Mercurial 存储库推送到 SVN。我们收到错误：
中止：抱歉，找不到合并修订版的 svn 父级。
合并的变更集有两个已合并的父级，看起来是正确的，但我无法推送svn 之后，不明白为什么 SVN 找不到父级。
任何帮助都会非常有帮助， 谢谢
For development we use Mercurial repository as wrapper for SVN repo for code-review in the project. Everything is working fine: developers are getting changes and commit own changes into Mercurial repository and project's team-lead sometimes is pushing changes from mercurial server repository to SVN server repository.
But we met with a problem. One day two devs pushed two changesets. For pushing it to server they merged all changes and pushed to server. Everything is good but after this we can't push changes from Mercurial repository to SVN. We are getting error:
abort: Sorry, can't find svn parent of a merge revision.
Merged changeset has two parents that was merged and looks like that it is correct but i can't to push into svn after and don't understand why SVN can't find parent.
Any help would be very helpful,
Thanks
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
Mercurial 特别是 hgsubversion 可以成为 Subversion 的一个非常好的客户端。然而，据说存在必须遵守的限制。
好处是，您可以
1) 对 Mercurial 存储库进行多次提交，并将所有这些更改作为单个修订版推送到 Subversion 存储库
坏处是，您仍然各个mercurial 存储库之间不具有交换的自由
1) 如果不使用subversion 作为中介，则无法交换更改。
大多数情况下，当我们有一个预先存在的 subversion 存储库并且我们希望转移到 Mercurial 而不丢失 subbersion 存储库中包含的所有历史记录时，我会使用 hgsubversion 。
如果想继续使用，就必须遵守一定的限制。请参阅下面的参考文献 2。
参考资料：
Mercurial specially hgsubversion can be a very good client to Subversion. How ever, said that there are limitations that must be observed.
The good thing is that, you can
1) Make multiple commits to your mercurial repo and push all those changes as single revision to Subversion repository
The bad thing is that, you still do not have the freedom of exchange between various mercurial repository
1) You can not exchange changes without using subversion as a intermediary.
Mostly, I use hgsubversion when we have a pre-existing subversion repository and we want to move over to Mercurial without losing all that history contained in the subbersion repo.
If you want to continue to use, you have to observe certain constraints. See the reference 2. Below.
References: