Mercurial: move MQ patch to shelve?

大城市里の小女人 提交于 2019-12-12 06:38:56

问题


Emacs VC mode show changes in directory state but ignore MQ changes...

I want to remove patch from queue and apply it on working directory.

This is possible with usual patch command, but it require passing some arguments and paths to utilities (which is inconvenient as not all environment allow autocompletion).

I expect hg built-in solution. Ideally - to move patch to shelve.


回答1:


Moving changes from MQ to working tree and forgetting it:

$ hg qgoto my.patch
$ hg qpop
$ hg qdel --keep my.patch
$ patch -p1 .hg/patches/my.patch
$ rm .hg/patches/my.patch

In Emacs to see difference in top MQ patches I find command C-u C-x v D qparent RET qtip RET which is:

$ hg diff -r qparent:qtip

or shorter:

$ hg diff -r qparent

or:

$ hg qdiff

but latest command doesn't present in Emacs VC mode.



来源:https://stackoverflow.com/questions/26425396/mercurial-move-mq-patch-to-shelve

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!