[11:17] <rindolf> Hi all. What can I do about this - http://paste.debian.net/235532/ ?
[11:17] <rindolf> I'm not on Debian - I'm on Mageia Linux Cauldron.
[11:19] <mgz> rindolf: generally you just delete/move the directory, then `bzr resolve path/from/conflict`
[11:19] <jelmer> what he said :)
[11:48] <m1sc> the ssl cert of my bazaar server changed a couple of days ago. bazaar doesn't  accept the new cert though ("certificate verify failed"). it is a valid cert though, accessing the server via curl or a browser works as expected. ideas?
[11:49] <jelmer> m1sc: make sure bzr is using the right ssl ca certificate
[11:52] <rindolf> mgz: thanks, that worked.
[11:52] <rindolf> mgz++
[11:55] <m1sc> jelmer: I'm not sure I understand: it's not some self signed certificate, so bzr should just accept it, no..?
[11:55] <jelmer> m1sc: it has to be signed by whatever CAs bzr knows about
[11:56] <jelmer> m1sc: it might be that the browser or curl are using a different ca list than bzr
[11:56] <jelmer> for example, were you previously perhaps specifying a custom CA file?
[12:00] <m1sc> jelmer: no, no custom ca