I tested again, with the latest bzr-gtk, and the same problematic merge, and it now commits ok. Thanks! Here's an interesting snippet from what gcommit printed:
Committing to: /home/mysql_src/tmp/monty/repo/retest/mysql-6.0-maria-tmp/ missing .bzr-mysql.moved modified .bzrignore modified configure.in missing server-tools
What are the "missing" lines? Note that John mentioned some "missing" files in his previous posts.
I tested again, with the latest bzr-gtk, and the same problematic merge, and it now commits ok. Thanks!
Here's an interesting snippet from what gcommit printed:
Committing to: /home/mysql_ src/tmp/ monty/repo/ retest/ mysql-6. 0-maria- tmp/
missing .bzr-mysql.moved
modified .bzrignore
modified configure.in
missing server-tools
What are the "missing" lines? Note that John mentioned some "missing" files in his previous posts.