创建一个 bzr 分支,选择性地忽略父分支的一些提交
是否可以创建 bzr 存储库的一个分支来选择忽略某些更改?例如,假设我的存储库位于修订版 354,我想对其进行分支,但我不想包含修订版 247 中所做的更改。
请注意,我计划在某个时间合并修订版 247 中的更改未来的一点。因此,我不想只对代码进行更改以撤消修订版 247 所做的操作,否则稍后当我尝试进行合并时会出现冲突。
bzr 可以实现这种类型的选择性分支吗?
Is it possible to create a branch of a bzr repository that selects omits certain changes? For example, let's say my repository is at revision 354, and I want to branch it, but I don't want to include the changes that were done in revision 247.
Note that I plan to merge in the changes from revision 247 at some point in the future. So I don't want to just make changes to the code that undo what revision 247 did, otherwise there will be a conflict later when I try to do the merge.
Is this type of selective branching possible with bzr?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
我认为您正在寻找 反向 Cherrypick 。这将允许您从分支中删除单个修订。
I think you're looking to Reverse Cherrypick. This will let you remove a single revision from a branch.
不。
修订版始终保证其所有父修订版。
如果您首先撤消并提交该修订,然后再重新应用它,我认为不会有太多冲突。
如果您不确定分支到临时目录并尝试一下。
no.
A revision always guarantees all of it's parent revisions.
I don't think you will have too many conflicts if you first undo and commit that revision and then later re-apply it.
If you are unsure branch into a temp directory and try it out.