[MERGE] Merge now warns when it encounters a criss-cross

[Erik Bågfors]

On Nov 30, 2007 11:33 AM, Michael Hudson <michael.hudson at canonical.com> wrote:
> Martin Pool wrote:
> > Martin Pool has voted tweak.
> > Status is now: Conditionally approved
> > Comment:
> > If you think this will help user understanding it's ok with me.
>
> As someone who has been confused by criss-cross merges before, I think
> this is a very good idea.
>
> > Maybe we can come up with a better message though:
> >
> > +                warning('Warning: criss-cross merge encountered.')
> >
> > So ok, the user now feels warned.  What are they to do?  If you could
> > tell them what they should do, or what the consequences are, or how to
> > avoid it, that would be better.
>
> You could link to http://revctrl.org/CrissCrossMerge, though that
> might be a bit hard core :-) Perhaps writing a friendlier page on the
> Bazaar wiki and linking to that would be sane, though.
>

No please.
A large point (at least for me) about a DVCS is that it can work in
disconnected mode. I've done useful things while on an airplane.  I
don't want a message linking to a page that I then can't access.

/Erik