Comment 3 for bug 483388

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

fullermd wrote:
>> This appears to be a criss-cross, but of two revisions that have no
>> parents (other than null:).
>
> In this repro script, the two branches share 2 common initial
> revisions. In the actual case I ran into it, the branches had 2 and 3
> (respectively) initial revs, with 2 of them being common, and for the
> branch with 3 initials, the leftmost initial rev was the uncommon one.
> But I don't believe either the extra uncommon path or the chirality
> matters.
>

Both branches do end up containing the initial (unrelated) commits.
Andrew is pointing out that the criss-cross means that neither of them
is a valid base to be used for merging, which means that we have to go
back further, and there *isn't* a single base that would work (aside
from NULL).

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.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksBh7sACgkQJdeBCYSNAANZCgCeKrpporvECo88N7dHtQoctTQF
r80An3A9+shVjwwqswnnDRiWwHfae79L
=QsOD
-----END PGP SIGNATURE-----