shelving

hg shelve installed but hg: unknown command 'unshelve'

由 你。 提交于 2020-01-14 10:25:07
问题 I installed the shelve extension for hg by adding 'shelve=' to [extensions]. I can verify this by running 'hg help extensions' which has the following in the output: enabled extensions: extdiff command to allow external programs to compare revisions fetch pull, update and merge in one command shelve Manage shelves of pickled objects. I then type 'hg shelve' in a repo of mine, and I get: hg: unknown command 'shelve' Mercurial Distributed SCM ... I would expect the shelve extension to run...

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

Mercurial: graft vs. record vs. qrecord vs. shelve vs. transplant vs. dirstate vs. queue

由 浪子不回头ぞ 提交于 2019-12-10 01:47:57
问题 I am new to Mercurial and still somehow in the evaluation process, so these four concepts are kind of confusing for me. Some are mentioned to be an equivalent to Git's Staging/Index concept, or some even a better one than Git's Staging. How do the four commands hg graft , hg record , hg qrecord and hg shelve (and hg transplant , but this is explained in Graft vs. Transplant already) compare to each other, and how the concepts of queues and the dirstate ? In which use cases is one choosen over

How can I easily diff/compare 2 shelvesets in TFS?

由 孤街浪徒 提交于 2019-12-09 04:30:47
问题 Is there a way to compare 2 shelves in TFS without having to resort to unshelving both in separate workspaces and diffing the files? 回答1: I don't have access to TFS currently, but if the file in the shelveset has a unique idenitifer (like say $/x/y/z/a.b.c;SH='ShelvesetName') you should be able to issue a command line tf dff command to compare each one. Or If you unshelve one and then use the command line TFS power tools to compare the other one with the review command tfpt review /shelveset

Mercurial: graft vs. record vs. qrecord vs. shelve vs. transplant vs. dirstate vs. queue

由 我的未来我决定 提交于 2019-12-05 02:06:48
I am new to Mercurial and still somehow in the evaluation process, so these four concepts are kind of confusing for me. Some are mentioned to be an equivalent to Git's Staging/Index concept, or some even a better one than Git's Staging. How do the four commands hg graft , hg record , hg qrecord and hg shelve (and hg transplant , but this is explained in Graft vs. Transplant already) compare to each other, and how the concepts of queues and the dirstate ? In which use cases is one choosen over the other? I know there are help pages for each one, but it still is difficult to figure out what each

How can I instruct Perforce to merge instead of overwrite or revert when unshelving a file?

由 风流意气都作罢 提交于 2019-11-27 17:24:33
问题 How can I instruct Perforce to merge changes into an existing, open, and modified file in the workspace when unshelving a file shelved in the depot? The only options that Perforce appears to offer the user is to overwrite or revert the existing file in the workspace, but this does not allow, for example, to unshelve and integrate changes to the same file from multiple change lists. Is there a way around this limitation? 回答1: What I typically do is right-click on the shelved file and select
订阅 shelving