mercurial - 如何 qfold 当前应用的补丁？

Question

我有两个与 MQ 一起应用的 Mercurial 补丁。我想将它们合二为一，但qfold需要不应用补丁。为什么？我怎样才能在不显式弹出的情况下折叠它们？

Answer 1

要折叠的补丁需要取消应用，以便折叠到应用的（当前）补丁上。

hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...

fold the named patches into the current patch

    Patches must not yet be applied. Each patch will be successively applied
    to the current patch in the order given. If all the patches apply
    successfully, the current patch will be refreshed with the new cumulative
    patch, and the folded patches will be deleted.

只有 2 个补丁，您只需取消应用最后一个补丁即可将其折叠在qbase补丁上。