Comment 12 for bug 125751

Hi John,

Am Donnerstag, den 13.09.2007, 14:17 +0000 schrieb John Carr:
> Not sure if this is the same bug or not. I don't get the tracebacks, but
> i do get the merge & push failure. Attaching a script that recreates it.
>
> ** Attachment added: "Create an svn repo, check it out, branch it.. do stuff, fail."
> http://launchpadlibrarian.net/9270266/test.sh
Merges have to be committed:

--- test.sh 2007-09-15 15:48:36.000000000 +0200
+++ test-commit.sh 2007-09-15 15:49:55.000000000 +0200
@@ -37,6 +37,7 @@
 # Try and update main repo...
 bzr push file://`(cd ../ && pwd)`/bzr-wc
 bzr merge
+bzr ci -m "Merge"
 bzr push

 # Eh, what happened??

Hope this helps.

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>