On 09-09-2010 9:47, Johan Samyn wrote:
On 09-09-2010 1:54, Michael Jay Lippert wrote:
Hi,
I've been using mercurial for a while now and I'm getting pretty
comfortable with it.
The way I've been using it involves creating lots of named branches
and doing lots of merging. It's been working really well, but I keep
coming across people who don't think that is such a good thing to do,
and I keep hearing about lots of people using mq.
The thing is although I've found some pages discussing how to use mq,
I haven't really found all the information I'd like.
In particular, how 'exactly' does one use mq with TortoiseHg?
I think I may have figured out some of it.
Enable the mq extension. This will add new interface elements, such
as a QNew box which, when filled in (with a filename? is there a
common syntax?), will create a new mq patch of all of the checked
items in the commit dialog.
Question: when is the qinit done? and what if you wanted the -c option?
Having an mq patch will enable the "Patch Queue" button, which will
display the patch queue. Unapplied patches will be grey?
You will see the applied patches as committed changesets in the
repository explorer (I've only tested so far w/ 1 patch, so I'm still
fuzzy on what it would look like w/ some patches applied and some not).
All changes you make will be rolled up with the changes already in
the current patch when you do a new commit (qrefresh).
When you're happy w/ all of the changes in the current patch you can
convert it to a real hg changeset by executing qfinish. The only
place I found that available was by right-clicking on the patch in
the "Patch Queue" window. Is there another way to do a qfinish?
All of that is fine for the simplest scenario, but what if you are
working on a patch for a week, and pulling changes daily some of
which cause conflicts with your changes?
I've read that you can use the rebase extension, but I'm not sure how
I might work that into my workflow, and if I would only use it if
there actually were conflicts?
Lastly how would you go about working on several 'features' at the
same time? Would you have several patches, one per feature, but all
intended to be applied to the default tip?
Are there any reference/tutorial pages that I should check out (that
I may not have seen)?
I can think of at least 3 things right now:
- The help info via 'hg help <mq-command>' (with mq enabled).
- On the Mercurial wiki: http://mercurial.selenic.com/wiki/MqExtension
- With the regular Windows installer you get "Mercurial - The
Definitive Guide", by Brian Sullivan, as a pdf into your Startup
Programs TortoiseHg folder. It has 2 chapters on the mq extension.
Misspelled the authors name, should be: Brian O'Sullivan
I realize this is asking for a lot, but using mq seems to be an
important part of using mercurial, and so I'd really like to
understand it better.
Thanks,
Mike
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
