[10:13] <pikkachu> how to change location of bazaar log, or better, deactivate it
=== mnepton is now known as mneptok
[17:43] <hsn> i have project in 6 branches. every branch contains part of project tree. Is there some simple way to merge them together with history?
[17:50] <LarstiQ> hsn: like having doc/ and lib/ in separate branches? In that case, `bzr join` might be what you want
=== yofel_ is now known as yofel
[18:14] <astraljava> Hi gang, I'm not using gnome-keyring on my system (Ubuntu Studio precise), so when I'm running `bzr launchpad-login $user`, I'm getting a warning about gnome-keyring not being able to connect to socket. I found a bug #906452 about it, but no solution (just speculation about an open bug on bzr-gtk, which I couldn't find).
[18:14] <ubot5> Launchpad bug 906452 in bzr (Ubuntu) "console launchpad-login warns about gnome-keyring in Precise" [Low,Triaged] https://launchpad.net/bugs/906452
[18:15] <astraljava> I know it's just a warning, but I'd rather not see it. :) What are my options?
[18:33] <hsn> LarstiQ: yes, that is right, doing it now. very usefull
[20:07] <hsn> I submitted bug report. bzr join screwed my repo - https://bugs.launchpad.net/bzr/+bug/971054
[20:07] <ubot5> Ubuntu bug 971054 in Bazaar "Checkout of joined branches fails" [Undecided,New]
[20:09] <jelmer> hsn: was any of the two branches created with bzr-git?
[20:10] <hsn> no. just one was in old format
[20:20] <hsn> if i do bzr update -r 1 ... -r 2 ... etc then it works to get good checkout
[20:25] <hsn> also bzr revert & bzr update builds tree ok
=== mwhudson_ is now known as mwhudson
[23:48] <poolie> hi all