[00:14] lifeless: actually "Connected (version 2.0, ..." means paramiko is being used. The "client OpenSSH_3.8..." in that string is actually paramiko reporting the server version. [00:15] lifeless: I filed a bug on paramiko about that recently. [00:15] grah [00:15] thanks === oubiwann-away is now known as oubiwann === mwhudson_ is now known as mwhudson === Ursinha is now known as Ursinha-afk [06:34] poolie_: http://sphinx.pocoo.org/ext/extlinks.html [07:24] spiv, https://code.edge.launchpad.net/~mbp/bzr/doc-2.2/+merge/32293 === oubiwann is now known as oubiwann-away === oubiwann-away is now known as oubiwann [09:01] * spiv is done for the day, see you tomorrow. === oubiwann is now known as oubiwann-away [09:08] hi all === oubiwann-away is now known as oubiwann === Ursinha-afk is now known as Ursinha [14:06] dipnlik: I could not find such a bug (https://bugs.launchpad.net/bzr-rewrite/+bugs?field.searchtext=dryrun), so maybe you can file one if you like. [14:06] ehm. ignore that === oubiwann is now known as oubiwann-away === oubiwann-away is now known as oubiwann === deryck is now known as deryck[lunch] [15:56] anyone know where I can find the branch management plugin vila was working on? === Ursinha is now known as Ursinha-lunch === khmarbaise_ is now known as khmarbaise === Ursinha-lunch is now known as Ursinha-brb [17:26] jelmer, quick question for you... if i'm working in a local bzr branch that has a remote svn parent (pushing/pulling) with bzr-svn ... and the remote branch makes changes and i merge them locally, when i push back, will it try and push back the merge? [17:27] rocky: Yes [17:27] even tho the merge should be empty right? [17:27] that feels like ugly artifacts [17:28] rocky: Why would it be empty? That merge would contain their change. [17:28] rocky: If you don't want a merge commit to appear, use rebase [17:29] hm [17:29] * rocky has to think about this some more [17:29] rocky: bzr-svn isn't any different from "normal" bzr in this regard. [17:30] sure, of course i use bzr-svn more often then i use regular bzr ;) [17:30] heh, ok === beuno is now known as beuno-lunch [17:38] is there a good solution to the umask issue? [17:39] (that newly remotely pushed branches don't get group writable, and I want them to) [17:39] hi quicksilver [17:39] quicksilver: I'm not aware of one, but jam might know. [17:41] jelmer, quicksilver: The only thing I've seen is writing a bzr wrapper that calls 'umask 002' before execing bzr proper [17:41] * quicksilver nods [17:41] or similarly for sftp, etc. [17:42] I wondered if it could be fixed in SSH config somehow [17:42] quicksilver: IIRC you can change the global default umask in one of the /etc files [17:42] or something like this: http://jeff.robbins.ws/articles/setting-the-umask-for-sftp-transactions [17:42] http://jeff.robbins.ws/articles/setting-the-umask-for-sftp-transactions [17:43] but bzr doesn't run as a subsystem, just another remote command [17:43] quicksilver: I'm never quite sure whether profile or whatever gets run [17:43] but I think changing /etc/profile.d to set a default umask for everyone to 0002 would get invoked [17:44] is there a way to specify an SVN revision when using bzr-svn? [17:44] jml: -rsvn:42 [17:45] jml, see also `bzr help revisionspec` [17:45] jelmer, it doesn't show up there [17:47] jml: that's odd, do you have a recent (less than a year old) version of bzr/bzr-svn? [17:47] huh, I don't even have it installed :) [17:48] I'm using a bzr branch made with bzr-svn :) [17:49] jelmer, sorry for the noise. [17:49] np === beuno-lunch is now known as beuno === Ursinha-brb is now known as Ursinha [22:26] can I tell .bzrignore to ignore everything in foo/ except foo/bar? [22:27] yes [22:27] you can give it a regex [22:27] OTOH [22:27] you can just add foo/bar [22:27] adds override ignores [22:27] though changes would still be ignored, yes? [22:27] to added files? no [22:27] so bzrignore is regex(5)? extended or non? [22:28] bzr help ignores [22:28] its zsh globs [22:28] with an optional make-a-line-a-regex mode [22:28] lamont: whats the situation though, I doubt you need this [22:28] whole bunch of stuff in foo, only want foo/bar to be in bzr from that directory [22:29] yeah [22:29] themes-y stuff [22:29] just bzr add foo/bar [22:29] done [22:29] bzr ignore foo [22:29] bzr add foo/bar [22:29] win [22:29] ta [22:29] * lamont looks at the clock, sleeps === Ursinha is now known as Ursinha-bbl === ddaa1 is now known as ddaa [23:47] Hi! any idea what might be causing 'Permission denied (publickey)' errors when I am trying to check out (branch) a branch from launchpad? 'bzr branch' says: "bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist." To make it more misterious, branching the same repo works as another user on another computer [23:48] do you have your ssh key present /unlocked [23:48] present? what does that mean? I am trying to do an 'anonymous checkout' [23:49] what url are you giving bzr ? [23:49] bzr+ssh://bazaar.launchpad.net/~gregor-muellegger/django-sorted-m2m-field/trunk/ [23:49] that uses ssh [23:50] so you need your ssh key on your machine [23:50] hmm. I'll try bzr+http [23:50] just http:// [23:50] do I also need an account on launchpad? [23:50] no bzr+ [23:50] ok [23:50] ah. http:// worked. Thanks!