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

Michael Hudson michael.hudson at canonical.com
Fri Nov 30 10:33:17 GMT 2007


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.

Cheers,
mwh



More information about the bazaar mailing list