On Mon, 2008-10-20 at 11:41 +0000, Michael Widenius wrote:
> I got the same error as Guilhem:
>
> What I did to get it was:
> - Branch a tree (mysql-6.0)
> - Merge with another tree (mysql-5.1-maria) with bzr merge --weave
> - Fixed merge issues, did make and make test to verify tre
> - bzr resolved --all
> - bzr gcommit
>
> I am now stuck and can't continue developing until this is fixed.
Please try 'bzr commit' rather than 'bzr gcommit'. Its extremely likely
that you are running into a bzr gtk specific issue and that 'bzr commit'
will just work. If it doesn't, then there is an issue in bzr's core that
I'll be delighted to help analyse and fix.
> Please prioritize this bug accordingly (we have a support contract with Canonical)
To ensure that your bugs are triaged and managed appropriately, please
be sure to all issues via the Canonical support team, who can help
ensure everyone relevant is aware of your issue and looking at it.
On Mon, 2008-10-20 at 11:41 +0000, Michael Widenius wrote:
> I got the same error as Guilhem:
>
> What I did to get it was:
> - Branch a tree (mysql-6.0)
> - Merge with another tree (mysql-5.1-maria) with bzr merge --weave
> - Fixed merge issues, did make and make test to verify tre
> - bzr resolved --all
> - bzr gcommit
>
> I am now stuck and can't continue developing until this is fixed.
Please try 'bzr commit' rather than 'bzr gcommit'. Its extremely likely
that you are running into a bzr gtk specific issue and that 'bzr commit'
will just work. If it doesn't, then there is an issue in bzr's core that
I'll be delighted to help analyse and fix.
> Please prioritize this bug accordingly (we have a support contract with Canonical)
To ensure that your bugs are triaged and managed appropriately, please
be sure to all issues via the Canonical support team, who can help
ensure everyone relevant is aware of your issue and looking at it.
-Rob www.robertcolli ns.net/ keys.txt>.
--
GPG key available at: <http://