[PATCH] rebase: write series file without removed mq patches

[Mads Kiilerich]

Gilles Moris wrote, On 01/17/2012 07:58 PM:
> On Tuesday 17 January 2012 02:59:58 am Mads Kiilerich wrote:
>> Mads Kiilerich wrote, On 01/17/2012 02:57 AM:
>>> # HG changeset patch
>>> # User Mads Kiilerich<mads at kiilerich.com>
>>> # Date 1326765355 -3600
>>> # Node ID 691e818a471349dfa4feabf905d0f53686188fc8
>>> # Parent  476a981fdf341f5bedbd958ca6c8e930fe35b5f9
>>> rebase: write series file without removed mq patches
>>>
>>> Rebase will remove empty changesets and will also completely remove the
>>> mq patch file for rebased empty patches.
>> That is in my opinion a bug too, but doing the wrong thing correctly is
>> a step in the right direction...
>>
>> /Mads
> I am finding it convenient for my users, as they use 'hg pull --rebase' from
> their MQ queue, and their patches clean up once they are integrated upstream.

Yes, it is nice to have an option for removing changesets which content 
"disappears" while rebasing because the merge algorithm see that it 
already has been applied to the new parent. But doing it by default and 
silently is surprising for a "rebase" command.

It is however clearly (IMO) a bug that it by default removes existing 
empty patches when they are rebased. Empty changeset might be 
questionable, but if they exist then there is probably a good reason for 
that and the changeset shouldn't be dropped by default.

/Mads