合并错误后，是否有办法找回商品? [英] Is there a way to get a mercurial shelf back after a merge mistake?

问题描述

当我搁置时，它使用了mercurial的合并功能，但是如果我完成合并并出现错误，我看不到任何方法可以找回原来的搁置补丁并重做某些事情.除了搜索备份驱动器之外，还有什么方法可以做到这一点? (或者撤消搁置操作并放回架子，或者查看补丁文件中的内容)

When I unshelve, it uses mercurial's merge capability, but I'm not seeing any way to get back the original shelved patch and redo things if I've completed the merge with an error. Aside from searching backup drives, is there any way to do that? (either to undo the unshelve action and put the shelf back, or to see what was in the patch file)

推荐答案

我发现了它-通过在.hg目录中四处查看.只需找到目录.hg/shelve-backup/.原始补丁写在这里.

I found it — by looking around in the .hg directory. Simply find the directory .hg/shelve-backup/. The original patch is written there.

我现在看到了hg help unshelve中提到的内容，尽管我之前错过了它(并且它没有说目录的名称)

I now see this is mentioned in hg help unshelve though I had missed it before now (and it does not say the name of the directory)

After a successful unshelve, the shelved changes are stored in a backup
directory. Only the N most recent backups are kept. N defaults to 10 but
can be overridden using the "shelve.maxbackups" configuration option.

这篇关于合并错误后，是否有办法找回商品?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！