[04:30] <Pikkachu> doesn't bazaar keep track of hidden files in windows?
[04:31] <Pikkachu> no output for bzr diff && bzr status when I changed some files to be hidden
[04:56] <bob2> it doesn't version permissions and modes aside from executableness
[05:25] <Pikkachu> ah ok
[05:25] <Pikkachu> thanks
[05:26] <bob2> well, at least in the past anyway
[12:48] <wgz> thanks for the ppa updates maxb
[13:07] <LarstiQ> hmm, http://wiki.bazaar.canonical.com/UserPreferences doesn't seem to work
[13:08] <LarstiQ> that or the login functionality
[13:15] <wgz> try again, for some reason the wiki has been flakey recently
[13:18] <LarstiQ> wgz: I think my problem is due to moving wiki infrastructure. It redirects me to ubuntu-sso, which I don't have.
[13:19] <LarstiQ> wgz: do you know how I can contact the responsible sysadmins?
[13:21] <wgz> not really, I presume asking in the internal #is channel someone would tell me, but not sure over the weekend
[13:21] <wgz> probably just posting something the the bazaar list is the best idea
[13:22] <fullermd> Eh, the wiki login went all wonky for me years back when it switch to bouncing through LP, and never recovered (at least, not so's I noticed).
[13:24] <LarstiQ> wgz: right, I'll do that when I'm out of ideas
[14:27] <jelmer> LarstiQ: you do have ubuntu-sso, it's just the same as the launchpad logins
[14:28] <LarstiQ> jelmer: it has a different set of email addresses
[14:30] <LarstiQ> jelmer: so it looks like there is at least _some_ divergence
[14:33] <jelmer> oh, that's odd
[14:33] <jelmer> IIRC the Launchpad SSO and Ubuntu SSO are just the same thing
[14:35] <LarstiQ> jelmer: from where I sit I'd guess they took a copy of my data at the time
[14:35] <LarstiQ> but that may well be far off the mark :)
[14:39] <maxb> LarstiQ: Launchpad SSO and Ubuntu SSO are the same thing.  BUT Launchpad and Launchpad SSO are not, and each have their own list of emails
[14:39] <maxb> Yes, this is mad.
[14:40] <maxb> It's an unfortunate result of separating SSO whilst attempting to avoid upsetting people who would be upset by Launchpad depending on not-Launchpad something
[14:40] <LarstiQ> maxb: aaah
[14:41] <LarstiQ> maxb: also from a ux perspective, when I'm already logged into launchpad, having ubuntu-sso prompt for credentials makes it seem different
[14:46] <maxb> It's a bit of an UX disaster all round :-/
[14:47] <maxb> There is a special perversity to *Single* Sign On *Doubly* Branded
[14:50] <LarstiQ> heh :)
[15:47] <jelmer> hmm, when did GPGStrategy grow into the 10-feet monster that it is?
[19:23] <antono> yo!
[19:23] <antono> how can i create local colocated branch in bzr 2.5 ?
[19:24] <antono> git checkout -b new_branch == bzr ... ?
[19:27] <jelmer> antono: "bzr switch -b new_branch"; though it should be noted that colocated branches are still experimental and unpolished
[19:27] <antono> jelmer: i want to try it anyway
[19:27] <antono> jelmer: thanks!
[19:29] <antono> jelmer: it works :) all other workflow stays the same as before?
[19:29] <antono> one problem. when i switched to new branch then bzr branches does not show previous trunk
[19:30] <jelmer> antono: right, that's one of the things that's still unpolished
[19:30] <jelmer> the first time you switch to a colocated branch you probably want to run "bzr switch -b trunk"
[19:31] <antono> exactly what i did :)
[19:31] <antono> not sure what will be remote repository for trunk now
[19:48] <antono> jelmer: how can i merge one colocated branch to another?
[19:52] <jelmer> antono: "bzr merge file:.,branch=someotherbranch"
[19:53] <jelmer> antono: eventually it should be "bzr merge co:someotherbranch"
[19:53] <antono> jelmer: last one looks better
[19:54] <antono> jelmer: thanks
[20:05] <LarstiQ> jelmer: or possibly `bzr merge someotherbranch` even?
[20:06] <jelmer> LarstiQ: possibly, though we need to watch out for ambiguity
[20:09]  * LarstiQ nods
[20:41] <LarstiQ> sinzui \o/
[22:13] <wilx> Hi.
[22:14] <wilx> Can I move branches/directories inside a repository into sub-directories while keeping them ok/functional?
[22:15] <wgz> yep.
[22:18] <wilx> Cool. Thanks.
[23:15] <maxb> Hmm, interesting. The dulwich test hang on lucid/maverick is client.fetch_pack(...) blocking forever on a socket read
[23:18] <maxb> looks like I can get away with building dulwich on maverick just by deleting the tutorial doctest
[23:31] <wgz> hm, doctests strike again