Comment 7 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" | #7 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
On 18/11/2010 22:50, GuilhemBichot wrote:
> I am using the latest lp:bzr, which has the fix above. I am
> re-running the same commands as when I filed the bug report, with the
> same revisions. I observe that indeed now, "bzr merge ../mm" does not
> produce an error anymore. However, it ends with 453 conflicts.
I did try this merge to test my patch. I ran it the same problem, and
investigated why. The mm branch allready has storage/innobase, which is
added by the jp branch, and unfortunatly has different file ids.