如何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补丁上。