[PATCH 0 of 1] RFC: mq/qpop --keep-wdir option

Stuart W. Marks smarks at smarks.org
Wed Nov 4 10:15:07 CST 2009


Dirkjan Ochtman wrote:
> On Tue, Nov 3, 2009 at 17:46, Sune Foldager <cryo at cyanite.org> wrote:
>> I often need a way to 'uncommit' the tipmost commit along some branch, returning the changes
>> to the working directory. This often happens with queues, which I use to move local changes around
>> with rebase. Currently, there is no simple way of doing this... so what do you guys think about
>> this small patch? It provides qpop with an option to leave the directory as it was before popping
>> and adjust the dirstate accordingly.
> 
> We discussed this is in the MQ usability thread a while ago, I think I
> proposed a qexclude command that would kind of do the opposite of
> qrefresh/qrecord. Would definitely be nice to have hunk-level
> granularity.

I've run into this use case and I solved it using the "hg qrefresh -X '**'" 
approach.

I must admit to being slightly opposed to this proposal, not on its own merits, 
but just because it's yet another isolated feature that's being added to MQ. MQ 
seems to have accreted a lot of features over time, and it would benefit from a 
more comprehensive approach.

Dirkjan, you mentioned that "MQ usability" thread from a while back (10 Aug 
2009). Like many such threads, there were some interesting ideas discussed; but 
I didn't see a conclusion. Did a plan or a summary of actions come out of this? 
I have some ideas for work I'd like to do on MQ, and I'd like to coordinate 
with any larger effort that's going on.

s'marks


More information about the Mercurial-devel mailing list