[PATCH] mq: qpush --move, reorder patch series and apply only the patch
Mads Kiilerich
mads at kiilerich.com
Sat May 1 10:50:55 CDT 2010
>
> On Sat, May 1, 2010 at 1:51 AM, Mads Kiilerich<mads at kiilerich.com> wrote:
>
>> Fails in what way? The following push can have rejects, but that is no
>> failure, so I am not sure what failure situations needs handling.
>>
> What happens if patch B modifies a line that patch A added, and I
> qpush --move A?
>
Exactly the same happens as when you reorder the patches manually (or
conflicts are introduced another way): The patch is applied, but the
conflicts ends up in .rej files and the user should probably apply the
rejects manually and refresh the patch.
/Mads
More information about the Mercurial-devel
mailing list