| spiv | 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:14 |
|---|---|---|
| spiv | lifeless: I filed a bug on paramiko about that recently. | 00:15 |
| lifeless | grah | 00:15 |
| lifeless | thanks | 00:15 |
| === oubiwann-away is now known as oubiwann | ||
| === mwhudson_ is now known as mwhudson | ||
| === Ursinha is now known as Ursinha-afk | ||
| spiv | poolie_: http://sphinx.pocoo.org/ext/extlinks.html | 06:34 |
| poolie_ | spiv, https://code.edge.launchpad.net/~mbp/bzr/doc-2.2/+merge/32293 | 07:24 |
| === oubiwann is now known as oubiwann-away | ||
| === oubiwann-away is now known as oubiwann | ||
| * spiv is done for the day, see you tomorrow. | 09:01 | |
| === oubiwann is now known as oubiwann-away | ||
| bialix | hi all | 09:08 |
| === oubiwann-away is now known as oubiwann | ||
| === Ursinha-afk is now known as Ursinha | ||
| amanica | 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 |
| amanica | ehm. ignore that | 14:06 |
| === oubiwann is now known as oubiwann-away | ||
| === oubiwann-away is now known as oubiwann | ||
| === deryck is now known as deryck[lunch] | ||
| jml | anyone know where I can find the branch management plugin vila was working on? | 15:56 |
| === Ursinha is now known as Ursinha-lunch | ||
| === khmarbaise_ is now known as khmarbaise | ||
| === Ursinha-lunch is now known as Ursinha-brb | ||
| rocky | 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:26 |
| jelmer | rocky: Yes | 17:27 |
| rocky | even tho the merge should be empty right? | 17:27 |
| rocky | that feels like ugly artifacts | 17:27 |
| jelmer | rocky: Why would it be empty? That merge would contain their change. | 17:28 |
| jelmer | rocky: If you don't want a merge commit to appear, use rebase | 17:28 |
| rocky | hm | 17:29 |
| * rocky has to think about this some more | 17:29 | |
| jelmer | rocky: bzr-svn isn't any different from "normal" bzr in this regard. | 17:29 |
| rocky | sure, of course i use bzr-svn more often then i use regular bzr ;) | 17:30 |
| jelmer | heh, ok | 17:30 |
| === beuno is now known as beuno-lunch | ||
| quicksilver | is there a good solution to the umask issue? | 17:38 |
| quicksilver | (that newly remotely pushed branches don't get group writable, and I want them to) | 17:39 |
| jelmer | hi quicksilver | 17:39 |
| jelmer | quicksilver: I'm not aware of one, but jam might know. | 17:39 |
| jam | 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 | |
| jam | or similarly for sftp, etc. | 17:41 |
| quicksilver | I wondered if it could be fixed in SSH config somehow | 17:42 |
| jam | quicksilver: IIRC you can change the global default umask in one of the /etc files | 17:42 |
| jam | or something like this: http://jeff.robbins.ws/articles/setting-the-umask-for-sftp-transactions | 17:42 |
| jam | http://jeff.robbins.ws/articles/setting-the-umask-for-sftp-transactions | 17:42 |
| jam | but bzr doesn't run as a subsystem, just another remote command | 17:43 |
| jam | quicksilver: I'm never quite sure whether profile or whatever gets run | 17:43 |
| jam | but I think changing /etc/profile.d to set a default umask for everyone to 0002 would get invoked | 17:43 |
| jml | is there a way to specify an SVN revision when using bzr-svn? | 17:44 |
| jelmer | jml: -rsvn:42 | 17:44 |
| jelmer | jml, see also `bzr help revisionspec` | 17:45 |
| jml | jelmer, it doesn't show up there | 17:45 |
| jelmer | jml: that's odd, do you have a recent (less than a year old) version of bzr/bzr-svn? | 17:47 |
| jml | huh, I don't even have it installed :) | 17:47 |
| jml | I'm using a bzr branch made with bzr-svn :) | 17:48 |
| jml | jelmer, sorry for the noise. | 17:49 |
| jelmer | np | 17:49 |
| === beuno-lunch is now known as beuno | ||
| === Ursinha-brb is now known as Ursinha | ||
| lamont | can I tell .bzrignore to ignore everything in foo/ except foo/bar? | 22:26 |
| lifeless | yes | 22:27 |
| lifeless | you can give it a regex | 22:27 |
| lifeless | OTOH | 22:27 |
| lifeless | you can just add foo/bar | 22:27 |
| lifeless | adds override ignores | 22:27 |
| lamont | though changes would still be ignored, yes? | 22:27 |
| lifeless | to added files? no | 22:27 |
| lamont | so bzrignore is regex(5)? extended or non? | 22:27 |
| lifeless | bzr help ignores | 22:28 |
| lifeless | its zsh globs | 22:28 |
| lifeless | with an optional make-a-line-a-regex mode | 22:28 |
| lifeless | lamont: whats the situation though, I doubt you need this | 22:28 |
| lamont | whole bunch of stuff in foo, only want foo/bar to be in bzr from that directory | 22:28 |
| lifeless | yeah | 22:29 |
| lamont | themes-y stuff | 22:29 |
| lifeless | just bzr add foo/bar | 22:29 |
| lifeless | done | 22:29 |
| lifeless | bzr ignore foo | 22:29 |
| lifeless | bzr add foo/bar | 22:29 |
| lifeless | win | 22:29 |
| lamont | ta | 22:29 |
| * lamont looks at the clock, sleeps | 22:29 | |
| === Ursinha is now known as Ursinha-bbl | ||
| === ddaa1 is now known as ddaa | ||
| abli | 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:47 |
| lifeless | do you have your ssh key present /unlocked | 23:48 |
| abli | present? what does that mean? I am trying to do an 'anonymous checkout' | 23:48 |
| lifeless | what url are you giving bzr ? | 23:49 |
| abli | bzr+ssh://bazaar.launchpad.net/~gregor-muellegger/django-sorted-m2m-field/trunk/ | 23:49 |
| lifeless | that uses ssh | 23:49 |
| lifeless | so you need your ssh key on your machine | 23:50 |
| abli | hmm. I'll try bzr+http | 23:50 |
| lifeless | just http:// | 23:50 |
| abli | do I also need an account on launchpad? | 23:50 |
| lifeless | no bzr+ | 23:50 |
| abli | ok | 23:50 |
| abli | ah. http:// worked. Thanks! | 23:50 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!