[PATCH 1 of 1] [mq] addchangegroupe finalize mq patches if changeset children are added

[Matt Mackall]

On Tue, 2011-03-15 at 12:18 +0100, Pierre-Yves David wrote:
> On Mon, Mar 14, 2011 at 03:34:10PM -0500, Matt Mackall wrote:
> > On Sun, 2011-03-13 at 12:08 +0100, Pierre-Yves David wrote:
> > > # HG changeset patch
> > > # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> > > # Date 1300014459 -3600
> > > # Branch stable
> > > # Node ID 37831a0e8aa5d553e9951894b737e38f00c4ac6c
> > > # Parent  38c9837b1f75f53cd3e5414e4283d21da1eb125f
> > > [mq] addchangegroupe finalize mq patches if changeset children are added.
> > 
> > I think I've been swayed by the arguments for aborting.
> 
> Which of the two finalist are prefered ?
> 
> Solution (1): abort on pull over mq bookmarks.
> solution (2): solution (1) but finalize inconsistent mq patches if -f is provided.

Let's start with (1), which fixes the bug and thus makes forward
progress. (2) can always be added later.

-- 
Mathematics is the supreme nostalgia of our time.