=== jelmer is now known as Guest86993 === Guest86993 is now known as jelmer === mmrazik is now known as mmrazik|lunch [11:17] Hi all. What can I do about this - http://paste.debian.net/235532/ ? [11:17] I'm not on Debian - I'm on Mageia Linux Cauldron. [11:19] rindolf: generally you just delete/move the directory, then `bzr resolve path/from/conflict` [11:19] what he said :) === ccxCZ_ is now known as ccxCZ [11:48] 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] m1sc: make sure bzr is using the right ssl ca certificate [11:52] mgz: thanks, that worked. [11:52] mgz++ [11:55] jelmer: I'm not sure I understand: it's not some self signed certificate, so bzr should just accept it, no..? [11:55] m1sc: it has to be signed by whatever CAs bzr knows about [11:56] m1sc: it might be that the browser or curl are using a different ca list than bzr [11:56] for example, were you previously perhaps specifying a custom CA file? [12:00] jelmer: no, no custom ca === mmrazik|lunch is now known as mmrazik === jordan_ is now known as jordan === wedgwood_away is now known as wedgwood === deryck is now known as deryck[lunch] === wedgwood is now known as wedgwood_away === wedgwood_away is now known as wedgwood === deryck[lunch] is now known as deryck