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