Git-svn:管理多个远程跟踪分支
目前我正在尝试通过 git-svn 并使用移植方法将 Git 存储库历史记录导出到 svn 中。到目前为止,我已经成功将git历史记录导出到svn中。但由于嫁接方法以及我的 git 存储库是从实际存储库克隆的,我最终得到了两个如下所示的远程分支。
o-----o-----o-----o-----o remotes/trunk, next
\ A' B' C' D'
\
\o----o-----o-----o remotes/origin/master, origin/master, master
A B C D
两个分支都反映相同的提交,因为 A' 是导入到 svn 的 git 历史记录。我想做的是 svn 将充当单向存储库,只有当版本准备好投入生产时,我才会提交更改为 SVN。
想知道是否有办法将两个分支简化为一个主干/分支。
我尝试过使用git update-ref refs/remotes/trunk origin/master 但是,当尝试将更改提交到 svn 时,由于重复的事务,这会导致失败。
希望有人能就此给我建议。我希望我清楚我的问题。
Currently I'm trying out exporting Git repository history into svn via git-svn and using grafts method. As of now, I have successfully exported the git history into svn. But because of the grafting method and that my git repository is cloned from the actual repository, I ended up having TWO remote branches like that of below.
o-----o-----o-----o-----o remotes/trunk, next
\ A' B' C' D'
\
\o----o-----o-----o remotes/origin/master, origin/master, master
A B C D
Both branches reflects the same commits as A' is that of git history imported into svn.What I'm trying to do is the svn will act as a one way repository where only when a release is ready go into production, then I will commit changes into SVN.
Would like to know if there is anyway to streamline the two branches into a single trunk/branch.
I've tried using git update-ref refs/remotes/trunk origin/master but this result in failure when trying to commit changes into svn due to duplcated transaction.
Hope someone can advise me on this. I hope I'm clear with my issue.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论