mq updates, more merging features
Chris Mason
mason at suse.com
Thu Nov 17 22:13:02 UTC 2005
Hello everyone,
I've pushed out a fresh set of patch merging features for mq. You'll be
able to find them in the usual place:
http://hg.serpentine.com/mercurial/mq
I changed around the mq three-way merging code last night, moving
everything to qpush --merge. This model seems easiest to use, but I'm
more than willing to rework it based on feedback. I've documented the
basic usage here:
http://www.selenic.com/mercurial/wiki/index.cgi/MqMerge
Samuel, I do plan on merging your work too, I just wanted to get this
out of the way. You'll get bonus points if you test out the merging
features to update your code, otherwise I'll merge your last patches up
to the new level.
-chris
More information about the Mercurial
mailing list