| === yofel_ is now known as yofel | ||
| === tchan1 is now known as tchan | ||
| Pikkachu | doesn't bazaar keep track of hidden files in windows? | 04:30 |
|---|---|---|
| Pikkachu | no output for bzr diff && bzr status when I changed some files to be hidden | 04:31 |
| bob2 | it doesn't version permissions and modes aside from executableness | 04:56 |
| Pikkachu | ah ok | 05:25 |
| Pikkachu | thanks | 05:25 |
| bob2 | well, at least in the past anyway | 05:26 |
| wgz | thanks for the ppa updates maxb | 12:48 |
| LarstiQ | hmm, http://wiki.bazaar.canonical.com/UserPreferences doesn't seem to work | 13:07 |
| LarstiQ | that or the login functionality | 13:08 |
| wgz | try again, for some reason the wiki has been flakey recently | 13:15 |
| LarstiQ | wgz: I think my problem is due to moving wiki infrastructure. It redirects me to ubuntu-sso, which I don't have. | 13:18 |
| LarstiQ | wgz: do you know how I can contact the responsible sysadmins? | 13:19 |
| 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:21 |
| 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:22 |
| LarstiQ | wgz: right, I'll do that when I'm out of ideas | 13:24 |
| === yofel_ is now known as yofel | ||
| jelmer | LarstiQ: you do have ubuntu-sso, it's just the same as the launchpad logins | 14:27 |
| LarstiQ | jelmer: it has a different set of email addresses | 14:28 |
| LarstiQ | jelmer: so it looks like there is at least _some_ divergence | 14:30 |
| jelmer | oh, that's odd | 14:33 |
| jelmer | IIRC the Launchpad SSO and Ubuntu SSO are just the same thing | 14:33 |
| 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:35 |
| 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:39 |
| 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:40 |
| 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:41 |
| maxb | It's a bit of an UX disaster all round :-/ | 14:46 |
| maxb | There is a special perversity to *Single* Sign On *Doubly* Branded | 14:47 |
| LarstiQ | heh :) | 14:50 |
| jelmer | hmm, when did GPGStrategy grow into the 10-feet monster that it is? | 15:47 |
| antono | yo! | 19:23 |
| antono | how can i create local colocated branch in bzr 2.5 ? | 19:23 |
| antono | git checkout -b new_branch == bzr ... ? | 19:24 |
| 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:27 |
| 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:29 |
| 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:30 |
| antono | exactly what i did :) | 19:31 |
| antono | not sure what will be remote repository for trunk now | 19:31 |
| antono | jelmer: how can i merge one colocated branch to another? | 19:48 |
| jelmer | antono: "bzr merge file:.,branch=someotherbranch" | 19:52 |
| jelmer | antono: eventually it should be "bzr merge co:someotherbranch" | 19:53 |
| antono | jelmer: last one looks better | 19:53 |
| antono | jelmer: thanks | 19:54 |
| LarstiQ | jelmer: or possibly `bzr merge someotherbranch` even? | 20:05 |
| jelmer | LarstiQ: possibly, though we need to watch out for ambiguity | 20:06 |
| * LarstiQ nods | 20:09 | |
| LarstiQ | sinzui \o/ | 20:41 |
| wilx | Hi. | 22:13 |
| wilx | Can I move branches/directories inside a repository into sub-directories while keeping them ok/functional? | 22:14 |
| wgz | yep. | 22:15 |
| wilx | Cool. Thanks. | 22:18 |
| maxb | Hmm, interesting. The dulwich test hang on lucid/maverick is client.fetch_pack(...) blocking forever on a socket read | 23:15 |
| maxb | looks like I can get away with building dulwich on maverick just by deleting the tutorial doctest | 23:18 |
| wgz | hm, doctests strike again | 23:31 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!