Strategies for push/merge problem?

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Wed Jul 16 00:48:03 CDT 2008


On Wed, Jul 16, 2008 at 4:40 AM, Douglas Philips <dgou at mac.com> wrote:
> On or about 2008 Jul 15, at 10:07 PM, Sean Russell indited:
>
>> On Tuesday 15 July 2008 07:43:04 pm Douglas Philips wrote:
>>> somewhere, etc.    I have to say, this is one place that darcs -
>>> absolutely- rocks. As I've been using Hg for a while, I've come to
>>> like Hg's view of history and darcs has some other deep problems, but
>>> all that said, darcs record (because of the way darcs commutes
>>> patches) hasn't yet been touched (I haven't used git, so maybe they
>>> do
>>
>> Are you using HG 1.0.1 yet?
>>
>>       http://www.selenic.com/mercurial/wiki/index.cgi/RecordExtension
>>
>> is now a "distributed with Mercurial" extension.
>
> Yes, that is very nice (as is the hunk selection capability (at
> commit) with TortoiseHg's bundled Qct.
>
> But what would really rock here is to fuse that with MQ such that I
> could add hunks to already existing patches without having to do the
> qpop/qpush dancing (as well as having the option to add hunks to
> patches created on the fly).

Something I've been thinking about before, too, and which I would
really really like. I could imagine a command that accepts a hunk to
patch mapping file as input. Then this file could be created using any
tool one desires (graphical, textual, whatever). So I for instance
would try to integrate this into meld.

So sad I've already got so much on my hg todo list. :/
-parren


More information about the Mercurial mailing list