[09:51] <Jip> hi
[09:51] <Jip> I have asked already, but does someone have an idea how to fix this? https://bugs.launchpad.net/armagetronad/+bug/1190375
[09:52] <Jip> I tried to bzr reconcile already
[09:52] <Jip> it seems that something went wrong with removing a file when another branch was merged ~800 revisions ago
[10:04] <lifeless> have you tried the bugfix jam proposed for it?
[11:05] <Jip> lifeless: how can I do that?
[23:56] <mwhudson> why can i not control-c a bzr serve process?
[23:56]  * bob2 vaugely blames threads
[23:56] <mwhudson> seems likely, doesn't it
[23:58] <lifeless> you should be able to
[23:58] <lifeless> if you can't, thats a bug