Bazaar

  1. Bug #588698
  2. Comment #5

Comment 5 for bug 588698

Revision history for this message
Gary van der Merwe (garyvdm) wrote : Re: [Bug 588698] Re: "bzr merge" fails "Branches have no common ancestor"

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

On 16/11/2010 21:54, Gary van der Merwe wrote:
> So it seems it is indeed a dup of bug 483388.

So after further investigation, I now see that this is different to bug
483388. Here is a revised graph exert:

    * <email address hidden>
    |
* | <email address hidden>
| |
 * | <email address hidden>
|\ |
| | * <email address hidden>
| \ /\
| X |
| / \ |
| | * svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:2315
| | |
| | * svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/innodb%2B:2316
|/
 * <email address hidden>
|
 * rev 1

It's important to note that the sub graph with root
svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/innodb%2B:2316 is
merge twice: by
<email address hidden>, and by
<email address hidden>.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkzjDooACgkQd/3EdwGKOh1X8QCghB4XBmFL+v5WWy7hdesT8Cq7
l5kAn3YvB8OpLOUMoOnzyebbzlw5Je28
=XlU8
-----END PGP SIGNATURE-----