不小心只重新调整了我的一个变更集
我有 3 个变更集，我想在最新修订的基础上重新建立基础。不幸的是，我只选择了其中一个来重新设置基础，因此这进行了合并。有什么方法可以撤消变基或更改它，以便其他两个更改集也得到变基？
I had 3 change sets that I wanted to rebase on top of the latest revisions. Unfortunately, I selected only one of them to be rebased and so this did a merge. Is there any way I can either undo the rebase or change it so the other two change sets get rebased as well?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
假设您没有将其推送到另一个存储库供其他人获取，那么您可以将这些变更集放在您想要的图表上的任何位置。您可以使用 hg rebase 移动变更集，并使用 hg 条。
strip 和 rebase 都将“撤消”信息保存为 .hg/strip-backup/ 中的 bundle 文件
请注意，默认情况下，mercurial 不会启用 strip 和 rebase。您需要在 .hgrc 文件中启用它们。
Assuming you haven't pushed it to another repo for others to grab, then you can put those changesets anywhere on the graph you want. You can move changesets with hg rebase and prune changsets and their descendents with hg strip.
Both strip and rebase save "undo" information as bundle files in your .hg/strip-backup/
Note that neither strip nor rebase are enabled by default with mercurial. You need to enable them in the .hgrc file.
如果这是您所做的最后一件事，您可以执行“hg rollback”，这是一级撤消。但是，如果您执行了任何更改存储库状态（推、拉、提交等）的操作，那么回滚将无济于事。
如果有什么安慰的话，合并通常比变基更可取，并且具有大量合并的善变历史表明有人充分利用了善变。 :)
If it's the very last thing you did you can do a 'hg rollback' which is a one-level undo. If, however, you've done anything since that alters the repository state (push, pull, commit, etc.) then rollback won't help you.
If it's any consolation, merging is generally preferable to rebasing and a mercurial history with a lot of merges shows someone who is using mercurial to its fullest. :)