MercurialQueues patch merging broken?

Giorgos Keramidas keramida at ceid.upatras.gr
Mon May 14 01:30:27 UTC 2007


On 2007-05-13 18:24, Bryan O'Sullivan <bos at serpentine.com> wrote:
>Giorgos Keramidas wrote:
>> Oops.  ENOATTACHMENT: I forgot to attach the patches.
> 
> I'd prefer to find a different approach than backing out my
> fix, even if it causes you problems with merging patch queues.
> Merging is much less frequent (I never do it) than hitting ^C
> while pushing, and the consequences of ^C are a terrible mess
> without my patch.  The merge feature is unusably complex as it
> stands, so you're possibly the only person being affected by
> this :-(

Agreed.  I am probably too sleepy to really find a fix now, so I
will look at the merge issue again when I get a good night's
sleep.  In the meantime, please everyone let's not push anywhere
the backout.  It was only a temporary 'local hack' to see if I
could fix the issue I was seeing...




More information about the Mercurial-devel mailing list