我可以从特定提交中删除 git-svn 元数据吗?
我正在 git-svn 克隆存储库中工作。我有一个跟踪 Subversino 功能分支的 git 分支,我已经对其进行了大量提交,并将它们dcommit
到 Subversion。合并 Subversion 分支被证明是非常痛苦的,所以我想将该分支重新设置为 master(或挑选我关心的提交),并摆脱 Subversion 分支。 (我不介意丢失 Subversion 合并历史记录)。
如果我没有将提交推送到 Subversion 就可以了,但如果我将提交变基/择优挑选到 master,它们就会包含 git-svn-id ,我认为这会导致dcommit
进程惊人地爆炸(尽管我不敢尝试)。
有没有办法为我想要提交的提交删除 git-svn-id (以及任何其他可能导致问题的不太明显的元数据)?
I'm working in a git-svn cloned repository. I've got a git branch tracking a Subversino feature branch, which I've made a load of commits to, and have dcommit
ed them to Subversion. Merging that Subversion branch is proving to be really painful, so I'd like to just rebase that branch onto master (or cherry-pick the commits I care about), and get rid of the Subversion branch. (I don't mind losing the Subversion merge history).
If I hadn't pushed the commits to Subversion it would be fine, but if I rebase/cherry-pick the commits to master, they come complete with the git-svn-id
which I presume will cause the dcommit
process to explode spectacularly (although I'm too afraid to try it).
Is there a way to strip out the git-svn-id
(and any other less-obvious metadata that might cause problems) for those commits that I want to bring across?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
抱歉,这个问题没有直接的答案。请参阅以下问题:
使用 git -svn(或类似的)只是来帮助进行 svn 合并?
git-svn 合并 2 个 svn 分支
Sorry no straight forward answer for this one. See these questions:
Using git-svn (or similar) just to help out with an svn merge?
git-svn merge 2 svn branches