Comment 4 for bug 483388

Revision history for this message
Matthew Fuller (fullermd) wrote : Re: [Bug 483388] Re: merge lies about lacking common ancestors

> Andrew is pointing out [...]

Oh, I understood. Was just adding background in case it mattered.

> I'm curious what you would get w/ "bzr merge --weave" though my
> guess is that the initial (find *some* common base) will still error
> out and not let you continue without an explicit base selection.

You guess correctly.