Train should try --weave if criss-cross merge is detected

[Michał Sawicz]

Enter trunk, foo, bar.

Foo and Bar MP'd against trunk.

Train fails - there's conflicts.

Bar merged into foo. Resubmitted. Reconfigured.

Train fails due to conflicts, criss-cross mentioned.

Curtain.

[Albert Astals Cid (aacid)]

Makes sense to me.

[Robert Bruce Park (robru)]

My question is, is it harmful to just always use 'bzr merge --weave'? Or is it really necessary to detect this specific error then retry merging with a different option? If possible I would prefer to just use one merge technique unconditionally, unless there is some big drawback of --weave for non-criss-cross cases.

[Michał Sawicz (saviq)]

W dniu 07.10.2015 o 10:04, Robert Bruce Park pisze:
> My question is, is it harmful to just always use 'bzr merge --weave'? Or
> is it really necessary to detect this specific error then retry merging
> with a different option? If possible I would prefer to just use one
> merge technique unconditionally, unless there is some big drawback of
> --weave for non-criss-cross cases.

Sorry for the late reply... I might be wrong, but I seem to remember
--weave doing bad things, so maybe it's not *ever* safe to use without
verifying the result... Not an expert on bzr, though, and couldn't
really find an answer on the interwebs :/

[Robert Bruce Park (robru)]

Yeah i looked into this a bit and it seems weave is a bit experimental, and
considering that bzr is currently unmaintained I'm a bit reluctant to start
using it in production
On Dec 3, 2015 4:21 AM, "Michał Sawicz" <email address hidden> wrote:

> W dniu 07.10.2015 o 10:04, Robert Bruce Park pisze:
> > My question is, is it harmful to just always use 'bzr merge --weave'? Or
> > is it really necessary to detect this specific error then retry merging
> > with a different option? If possible I would prefer to just use one
> > merge technique unconditionally, unless there is some big drawback of
> > --weave for non-criss-cross cases.
>
> Sorry for the late reply... I might be wrong, but I seem to remember
> --weave doing bad things, so maybe it's not *ever* safe to use without
> verifying the result... Not an expert on bzr, though, and couldn't
> really find an answer on the interwebs :/
>
> --
> You received this bug notification because you are subscribed to CI
> Train [cu2d].
> https://bugs.launchpad.net/bugs/1313697
>
> Title:
> Train should try --weave if criss-cross merge is detected
>
> Status in CI Train [cu2d]:
> Incomplete
>
> Bug description:
> Enter trunk, foo, bar.
>
> Foo and Bar MP'd against trunk.
>
> Train fails - there's conflicts.
>
> Bar merged into foo. Resubmitted. Reconfigured.
>
> Train fails due to conflicts, criss-cross mentioned.
>
> Curtain.
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/cupstream2distro/+bug/1313697/+subscriptions
>

[Launchpad Janitor (janitor)]

[Expired for CI Train [cu2d] because there has been no activity for 60 days.]