如何强制与祖先合并? [英] How to force a merge with an ancestor?

问题描述

我分支了变更集"A".后来，"A"被合并为默认值.然后，确定"A"尚未准备就绪，因此有人hg revert -a将其升级到了较旧的版本，并将其推向了更高版本.现在，我正在尝试将default合并到我的分支中，但是由于这些更改已还原，因此它们全部都从我的分支中删除了.

I branched off changeset "A". Later, "A" was merged into default. Then it was decided that "A" was not ready to go live, so someone hg revert -a'd it to an older revision and pushed that. Now I'm trying to merge default into my branch, but because those changes were reverted, they're all being ripped out of my branch.

我想强制与"A"重新合并，以便我可以收回所有这些更改.我该怎么办?

I want to force a re-merge with "A" so that I can get all those changes back. How can I do that?

更新:我只是尝试撤消撤消了"A"操作的变更集.看起来这给了我所有的代码更改.

Update: I just tried backing out the changeset that undoing "A" was made on. It looks like this gave me all my code changes back.

推荐答案

看起来您已经解决了问题.我正要指出您 http://hgbook.red- bean.com/read/finding-and-fixing-mistakes.html ，然后提到您尝试"hg revert"先前还原了您想要的更改的提交.

It looks like you solved your problem already. I was going to point you to http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html and then mention that you try to "hg revert" the commit that previously reverted the changes you want back.

这篇关于如何强制与祖先合并?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！