| === vxnick is now known as vxnick-AFK | ||
| igc | morning all | 00:42 |
|---|---|---|
| * fullermd_ waves at igc. | 00:44 | |
| fullermd_ | igc: Are you currently (in general, not this second) working on filtering stuff, or is that pushed down the stack? | 00:45 |
| garyvdm | Hi igc | 00:47 |
| jml | morning #bzr | 00:47 |
| garyvdm | Hi jml | 00:48 |
| jml | I'm going to release Bazaar 1.17 today | 00:49 |
| poolie | jml, you legend | 00:49 |
| poolie | i hope you had a hearty breakfast | 00:49 |
| igc | hi fullermd: back on the content filter bugs today (after higher priority reviews) | 00:49 |
| jml | poolie, I haven't eaten, in fact. | 00:49 |
| igc | hi garyvdm! | 00:49 |
| poolie | i'm going to try to finish outstanding reviews and my assigned bugs | 00:50 |
| poolie | ie not spend all week on phone and email, as i did last week :/ | 00:50 |
| fullermd_ | igc: Sweet. I don't have anything particular on it, was just curious where it fell. Looking forward to it! | 00:50 |
| fullermd_ | It's amazing how much you can accomplish when you turn off the ringer ;) | 00:51 |
| === fullermd_ is now known as fullermd | ||
| igc | fullermd_: it's less important than making 2a stable | 00:51 |
| igc | fullermd_: but I find it personally embarrassing and ... | 00:51 |
| fullermd | Sure, but can't I have everything all at once? Immediately? And a pony? | 00:51 |
| igc | I'd really like to ensure it's working properly by the 2.0 release | 00:52 |
| fullermd | The sad part is that a key component of going from "works" to "usable" is per-branch config of it, and every time that comes up we all get eaten by a grue :| | 00:52 |
| igc | fullermd: if you provide the patches (and parent ponies), I'll merge them immediately :-) | 00:53 |
| igc | fullermd: so I guess that makes you the bottleneck :-) | 00:53 |
| fullermd | That sounds messy... | 00:54 |
| poolie | jml, speaking of your stats on launchpad | 00:59 |
| poolie | i was thinking after La Mola that it might be interesting to do brief stats on our releases as to | 00:59 |
| poolie | what kind of bugs we fixed: plain bugs, new features, regression fixes, | 00:59 |
| poolie | if it was late, or how controlled the release process was in general and maybe why | 01:00 |
| poolie | this might not be worth it but it might be interesting to look back | 01:00 |
| jml | poolie, well, my LP stats had the advantage of being really easy to get using bzr log + grep | 01:00 |
| poolie | nb i'm not suggesting adding any additional work to your plate for today | 01:00 |
| jml | poolie, good good :) | 01:00 |
| poolie | yeah this would be at least partially manual | 01:00 |
| jml | poolie, those would definitely be interesting stats to have. | 01:03 |
| jml | although they'd all need strong not-a-metric qualifiers :) | 01:03 |
| poolie | you could get some kind of medium-term feedback on it perhaps... | 01:03 |
| poolie | s/on/from | 01:03 |
| poolie | i may try it one jetlagged morning | 01:04 |
| jml | good idea | 01:12 |
| igc | garyvdm: those pending merge screen snapshots are nice - well done! | 01:32 |
| garyvdm | Thanks | 01:32 |
| mwhudson | jelmer: a bzr-git branch is doing this: | 01:38 |
| mwhudson | SHA1KnitCorrupt: Knit <bzrlib.knit._VFContentMapGenerator object at 0x86c7a10> corrupt: sha-1 of reconstructed text does not match expected sha-1. key ('git-v1:56599cc5b24f8a4e30423898c7cf5077c569b9ee',) expected sha d28a73fcdd473745fce7765c35fe419613e278e9 actual sha b3391cd0e3bc7a3c9a510c2055fd469ea5458821 | 01:38 |
| mwhudson | (i'm not actually sure which branch it is :() | 01:38 |
| mwhudson | jelmer: heard of this? | 01:38 |
| poolie | igc/garyvdm, is there already an option somewhere that does the equivalent of bzr commit --show-diff? | 01:44 |
| igc | poolie: you mean on qcommit? | 01:45 |
| poolie | mm | 01:45 |
| poolie | preferably a gui option not a command line one | 01:45 |
| igc | qcommit has a Diff button | 01:45 |
| poolie | of course | 01:45 |
| igc | poolie: and if you're using explorer, the status view shows you what's changed | 01:46 |
| poolie | right | 01:46 |
| poolie | i suppose i meant to pop that up automatically | 01:46 |
| poolie | but that does sound pretty lazy doesn't it :) | 01:47 |
| jelmer | mwhudson: hi | 01:47 |
| mwhudson | jelmer: hello | 01:48 |
| jelmer | mwhudson: haven't seen that before | 01:48 |
| mwhudson | jelmer: ok, i'll try to find out where it's coming from | 01:48 |
| garyvdm | poolie: Sorry - I was away. Not quite sure what you are asking. | 01:51 |
| poolie | s'ok, igc answered it | 01:51 |
| garyvdm | ok | 01:51 |
| spiv | jml: I'm about to submit that patch for merging into 1.17 | 01:54 |
| spiv | jml: it's the same fix as Friday, but now I have a test :) | 01:54 |
| garyvdm | poolie: Is this ok: http://bazaarvcs.wordpress.com/?p=39&preview=true ? | 02:04 |
| jelmer | mwhudson: My guess would be that we're calculating and inserting a wrong SHA1 somewhere, or used to at some point. | 02:14 |
| jelmer | mwhudson: possibly because we fail to update InventoryEntry.text_sha1 in a corner case. | 02:15 |
| jelmer | mwhudson: when is it giving that error exactly? during "bzr pull" from git? | 02:16 |
| mwhudson | jelmer: no, in trying to generate a diff for a revision mail | 02:16 |
| jelmer | mwhudson: ah, interesting | 02:17 |
| jelmer | mwhudson: so there would potentially be more branches with this issue, it just hasn't been noticed yet because nobody is subscribed to diff emails? | 02:18 |
| mwhudson | jelmer: it's possible | 02:18 |
| * mwhudson files a bug "job system oops reports don't tell you which branch is being processed" | 02:19 | |
| poolie | garyvdm: very nice, thanks | 02:20 |
| jelmer | mwhudson: btw, did you see my reply to your bzr-svn + python2.4 bugreport? | 02:36 |
| mwhudson | jelmer: yes | 02:36 |
| mwhudson | jelmer: i'll try to reply sensibly soon | 02:36 |
| mwhudson | (it's been one of those mornings) | 02:36 |
| malibu | Hi there.. I just came across Bazaar... | 02:43 |
| malibu | I'm trying to set up a repository on my windows machine.. Something like the dropbox idea.. how is bazaar at handling regular windows kind of files? | 02:44 |
| lifeless | it should handle them fine | 02:44 |
| malibu | I used to use svn but the repository was too big.. The local repo would be the same size as the actual fles | 02:44 |
| lifeless | if your files are binary, you'll find that most VCS systems have that property, and those that don't are very slow ;) | 02:45 |
| malibu | ugh.. how do sites like dropbox do it then? | 02:46 |
| lifeless | on their server they will have a copy of your files | 02:47 |
| lifeless | and if your files are binary, it will be about the same size as your files ;) | 02:47 |
| malibu | Oh.. yeah but i don't mind that on the server | 02:47 |
| lifeless | oh, you mean on your machine? | 02:47 |
| malibu | What I mean.. is with SVN it doubles the local storage | 02:47 |
| lifeless | it does that because it has local data | 02:48 |
| lifeless | copies of the files to do diff operations with | 02:48 |
| lifeless | VCS systems like to make 'diff' operations quick | 02:48 |
| malibu | Does bazaar do that as well? | 02:48 |
| lifeless | we keep a copy of all your history since you started the project | 02:49 |
| lifeless | same as git, hg, darcs and monotone | 02:49 |
| malibu | hmm.. not what I want then | 02:49 |
| lifeless | perhaps you don't want a VCS? | 02:49 |
| malibu | I want something like dropbox | 02:49 |
| lifeless | do you need history? diffing? annotate? | 02:49 |
| malibu | I want a history and versioning. Not diffing or annotate | 02:50 |
| lifeless | are you on a LAN, or working over the internet? | 02:50 |
| malibu | mostly LAN, sometimes internet | 02:50 |
| malibu | I need it to work over ssh, preferably | 02:56 |
| malibu | I want a dropbox idea but on my own server | 02:56 |
| === timchen1` is now known as nasloc__ | ||
| lifeless | well, you could use bzr with lightweight checkouts | 02:59 |
| lifeless | they don't have a local cache | 02:59 |
| lifeless | but the tradeoff is that its a lot slower to do many operations | 02:59 |
| lifeless | igc: I'm fixing apply-inventory-delta branch | 03:02 |
| lifeless | igc: are there any issues other than test failures now? | 03:02 |
| igc | lifeless: I'm just looking over the code now | 03:02 |
| malibu | lifeless: I will look into that | 03:04 |
| malibu | lifeless: What is the windows client like for bazaar? Does it have something like TortoiseSVN? | 03:13 |
| lifeless | There is a TortoiseBZR, yes | 03:14 |
| malibu | cool | 03:15 |
| malibu | bzr uses ssh? | 03:15 |
| spiv | malibu: it can, yes. | 03:15 |
| lifeless | if you want it to, yes | 03:15 |
| malibu | ok | 03:16 |
| igc | malibu: see http://bazaar-vcs.org/BzrExplorer as well | 03:17 |
| lifeless | malibu: or iFolder, apparently it has an open source server component | 03:25 |
| malibu | So say I do light checkouts.. bzr will still try to do things efficiently right? For example, will it send a file if the last modification times haven't changed? | 03:25 |
| lifeless | it does a sha1 check before uploading anything | 03:26 |
| malibu | Because as long as it's efficient as, say, rsync.. I'm fine with that | 03:26 |
| malibu | come to think of it, does it only send deltas of binary files? | 03:26 |
| lifeless | that depends | 03:27 |
| lifeless | :) | 03:27 |
| malibu | ok.. I'm just going to try it. | 03:29 |
| malibu | repo on my ubuntu machine, tortoisebzr on my windows laptop | 03:30 |
| malibu | With light checkouts | 03:31 |
| malibu | (rock on) | 03:31 |
| poolie | spiv, re the inventory-delta branch, you're going to put back IDS? | 03:35 |
| poolie | hm actually apparently you said you were going to do without it in the review... | 03:35 |
| === _SamB_ is now known as SamB | ||
| spiv | poolie: I'm currently thinking I'll put it back for now, so that the other changes aren't blocked. | 03:47 |
| poolie | k | 03:47 |
| spiv | I still think we want to get rid of it :) | 03:47 |
| * igc lunch | 03:53 | |
| jml | spiv, lifeless: got any ideas on how I can trigger a logged exception onthe staging smartserver? | 03:57 |
| spiv | jml: what bzr version? 1.16.1? | 04:01 |
| lifeless | jml: what bzr version is it running? | 04:01 |
| lifeless | jinx | 04:01 |
| spiv | jml: if so, call any unknown smart method... | 04:01 |
| spiv | jml: more creatively, issue a ('get', '../foo') | 04:01 |
| jml | I'm not 100% sure, either 1.16.1 or 1.17rc1 | 04:02 |
| spiv | (lp:bzr-ping is a good, short plugin to crib from if you want inspiration for generating arbitrary simple requests) | 04:02 |
| jml | spiv, thanks | 04:03 |
| jml | although I get stopped on the client side when I try client.call('oprah') | 04:04 |
| * jml digs around | 04:05 | |
| SamB | jelmer: what is this about? | 04:05 |
| SamB | Now on revision 3127. | 04:05 |
| SamB | Conflicting tags: | 04:05 |
| SamB | bzr-svn-0.6.3 | 04:05 |
| * SamB also wishes bzr would have told him what revision it started at at the end there ... | 04:06 | |
| SamB | oh, just four revs but tons of pyflakes fixes? | 04:06 |
| * SamB wonders what pyflakes is | 04:07 | |
| SamB | well, I mean, I can rather guess that it's some sort of lint tool ;-) | 04:07 |
| SamB | jelmer: oh, you tagged the wrong 0.6.2 as 0.6.3 :-P | 04:10 |
| SamB | er. s/the wrong// | 04:11 |
| malibu | When I try to do a checkout with tortoisebzr, I get error: TortoisebzrCommandError: Illegal command 'revert' | 04:12 |
| spiv | jml: the client side will see the error bit in the response and raise the response as ErrorFromSmartServer rather than returning it. | 04:13 |
| malibu | Sorry, unknown command 'revert' | 04:13 |
| jml | spiv, I had to comment out this line -- #self._run_call_hooks(method, args, body, readv_body) -- for it to talk to the server at all | 04:13 |
| SamB | malibu: geeze, they really should allow selecting the text in those dialogs so you can copy/paste it! | 04:14 |
| spiv | jml: weird | 04:14 |
| malibu | yeah I know | 04:15 |
| spiv | jml: do you have some sort of weird plugin installed that installs a buggy hook? | 04:15 |
| spiv | jml: oh, I know. | 04:17 |
| spiv | jml: will fix, thanks for the report. | 04:17 |
| jml | spiv, http://paste.ubuntu.com/222366/ | 04:17 |
| jml | spiv, np | 04:17 |
| jml | back home | 04:18 |
| spiv | jml: (it's a bug in the hook function installed by -Dhpss) | 04:18 |
| * SamB is beginning to think there's a *reason* it's called Bundle Buggy | 04:18 | |
| spiv | Hmm, I'm pretty sure I type my gpg passphrase faster shortly after having a coffee. Pity that I seem to also mistype more too... | 04:28 |
| verterok | f | 04:30 |
| lifeless | hmm, not bzr 1.18 milestone | 04:40 |
| * lifeless maksifies | 04:40 | |
| lifeless | hmm | 04:41 |
| * SamB hopes igc notices https://code.launchpad.net/~naesten/bzr-fastimport/400960-heredocs/+merge/9015 soon | 04:42 | |
| * SamB got his wires crossed and requested some random unrelated person to review it :-( | 04:44 | |
| poolie | spiv, i've wanted to write some program that tracks my typo rate | 04:52 |
| poolie | and typing rate | 04:52 |
| lifeless | WTB review: https://code.edge.launchpad.net/~lifeless/bzr/bug-367632/+merge/8928 | 04:53 |
| poolie | want to buy? | 04:53 |
| lifeless | yes | 04:53 |
| poolie | lol | 04:53 |
| igc | lifeless: I took a quick look at that one this morning | 04:53 |
| poolie | mary's sig the other day said something about "Do real heros start their career squashing household pests?" | 04:53 |
| igc | lifeless: I thought we ought to get the apply-inv-delta one landed first | 04:54 |
| lifeless | igc: why? | 04:54 |
| lifeless | igc: the bug 367632 bad deltas are already caught | 04:54 |
| ubottu | Launchpad bug 367632 in bzr "bzr revert '.' can fail when there are added, missing, directories." [High,Fix committed] https://launchpad.net/bugs/367632 | 04:54 |
| igc | given I think it depends on it doesn't it (wrt the corruption fix)? | 04:54 |
| lifeless | this just fixes the cause | 04:54 |
| lifeless | igc: bug 367632 was about the delta generation. bug 367633 was the corruption | 04:55 |
| ubottu | Launchpad bug 367633 in bzr "errors on revert propogate to dirstate" [High,Fix committed] https://launchpad.net/bugs/367633 | 04:55 |
| malibu | hey is bazaar 1.17 not ready or something? I can't seem to use tortoisebzr with it | 04:56 |
| igc | lifeless: ok, I'll look a bit deeper later today | 04:57 |
| lifeless | igc: its very shallow | 04:57 |
| lifeless | though it took me ages to dig through the layers to find it ;) | 04:57 |
| spiv | poolie: typo rate judged by % of backspace hits? | 04:57 |
| igc | lifeless: maybe the bug comments confused me or something | 04:57 |
| poolie | yes, or ^w or alt-backspace or similar | 04:57 |
| poolie | obviously this is not perfect | 04:58 |
| spiv | Yeah. | 04:58 |
| spiv | It won't notice my mistyped passphrase, for example :) | 04:58 |
| spiv | But that's a bit of a special case anyhow. | 04:58 |
| igc | SamB: I'll take a look | 04:58 |
| poolie | spiv, why not? | 05:02 |
| poolie | because you tend to type C-a and retype the whole thing? | 05:02 |
| poolie | also xchat ^w =close window sucks :) | 05:03 |
| spiv | poolie: because I am usually typing it into mutt, hitting enter, then getting the 'bad passphrase' message, so no ^A, ^W or backspace is involved. | 05:05 |
| malibu | Does bzr support nested repositories? | 05:05 |
| SamB | malibu: seems to be in-progress | 05:05 |
| poolie | oh i see | 05:05 |
| spiv | I really should futz about with making mutt and gnome-gpg or whatever is shiny these days play nice with each other. | 05:05 |
| SamB | spiv: it depends what GTK theme you have configured | 05:06 |
| spiv | But anything related to driving gpg very quickly drives me into a mini rage about how awful gpg... | 05:06 |
| spiv | 'how awful gpg is', that is. It's very unfriendly software. | 05:07 |
| SamB | it could be worse -- it could be x.509! | 05:07 |
| spiv | Heh. | 05:08 |
| spiv | My issue isn't with the underlying format/spec, it's just that the software to use and manipulate keys is so damn awful. | 05:09 |
| SamB | what's the trendy PPA for bzr nightlies nowadays? | 05:09 |
| poolie | google bzr nightly ppa | 05:09 |
| poolie | :) | 05:09 |
| SamB | spiv: well, okay, it has a UI that might have been nice when I was born ;-) | 05:09 |
| poolie | pretty sure that's right | 05:09 |
| SamB | for reference, I was born in '86 | 05:10 |
| SamB | poolie: okay ... that seems to be what I'm using ... | 05:10 |
| * SamB wishes those things had the date in the version somewhere | 05:10 | |
| poolie | that would be nice | 05:10 |
| SamB | I don't have a clue what to report that wish against, though! | 05:11 |
| spiv | SamB: it has a UI that makes me pine for tla :P | 05:11 |
| SamB | spiv: no, it's not nearly *that* bad! | 05:11 |
| poolie | i hope that's not a pun :) | 05:11 |
| SamB | I mean, you don't have to use it that much | 05:11 |
| SamB | poolie: pretty sure it's not | 05:11 |
| SamB | I don't see how tla relates to an email client he doesn't even use | 05:11 |
| spiv | SamB: I dunno, tla made me want to drill holes in my head less than gpg. | 05:11 |
| SamB | spiv: when was this? | 05:12 |
| SamB | had you used a VCS with a half-decent UI at the time? | 05:12 |
| spiv | Stiil, I can believe it's a matter of taste about whether awful thing A is more or less awful than awful thing B :) | 05:12 |
| SamB | I mean, GPG may have a really rusty UI | 05:13 |
| SamB | but it doesn't have those %@%^#^ stupid paths! | 05:13 |
| SamB | or revision names or whatever the heck those things are | 05:13 |
| SamB | jelmer: bzr-svn needz moar -D ! | 05:16 |
| * SamB can't seem to svn-import from https://dosemu.svn.sourceforge.net/svnroot/dosemu today :-( | 05:17 | |
| jml | spiv, has the fix for bug 400535 landed? | 05:18 |
| ubottu | Launchpad bug 400535 in bzr "ChrootServer/ChrootTransport not used by "bzr serve"" [Critical,Fix committed] https://launchpad.net/bugs/400535 | 05:18 |
| jml | lifeless, bug 397705 is marked for 1.17 & not fix released -- what's missing? | 05:18 |
| ubottu | Launchpad bug 397705 in bzr "inventory delta consistency checks are missing known problems and not universally applied." [Critical,Fix committed] https://launchpad.net/bugs/397705 | 05:18 |
| lifeless | jml: it was a placeholder | 05:19 |
| lifeless | jml: ignore it | 05:19 |
| lifeless | jml: it will be in 1.18 | 05:19 |
| lifeless | jml: (and you have the bit I wanted to get into 1.17 already) | 05:20 |
| SamB | oh, actually, svn can't connect either :-( | 05:20 |
| jml | lifeless, cool. | 05:22 |
| jml | lifeless, consider it ignored :) | 05:22 |
| malibu | So I created a repo on my ubuntu server, was able to check out the empty repo with tortoisebzr, but when I add files to the local working copy I don't get add or commit options in the context menu ? | 05:24 |
| malibu | Not sure what I am doing wrong | 05:25 |
| malibu | Oh ok now I get the commit option.. wierd! | 05:26 |
| spiv | jml: I sent it to PQM (for bzr.dev) a while ago. | 05:27 |
| spiv | jml: it's still playing, but on the second half of the test run by the looks. | 05:27 |
| jml | spiv, cool. I guess I'll cherrypick it into 1.17 then merge back into bzr.dev | 05:28 |
| spiv | jml: sounds good. It should cherrypick neatly aside from the NEWS entry. | 05:29 |
| jml | \o/ | 05:30 |
| jml | grunk. I think I screwed up one of the commits to 1.17 :\ | 05:35 |
| SamB | quick! darcs rollback! ... | 05:35 |
| lifeless | jml: tip looks odd | 05:36 |
| jml | lifeless, yeah exactly. | 05:37 |
| SamB | what, did he lose the old one somehow ? | 05:37 |
| jml | lifeless, I'm going to uncommit it and then check the news file to make sure that all of the bugs marked for 1.17 are still present | 05:38 |
| jml | (not being able to think of a better way to sanity check) | 05:38 |
| SamB | you can do that? | 05:39 |
| SamB | (uncommit, I mean) | 05:39 |
| spiv | SamB: bzr help uncommit :) | 05:39 |
| spiv | SamB: (often followed by a push --overwrite...) | 05:39 |
| SamB | I meant in a "you won't get flayed alive for it" | 05:39 |
| SamB | kind of way | 05:39 |
| spiv | Well, that depends :) | 05:40 |
| SamB | I did actually know about the command | 05:40 |
| SamB | it's handy | 05:40 |
| SamB | oh, yeah, and I did think some branches disallowed push --overwrite? | 05:40 |
| spiv | I forget if the branch.conf option disables that, but certainly you could write a smart server hook fairly easily that would reject that sort of change. | 05:43 |
| lifeless | jml: seems fine, get spm to uncommit the master for you | 05:50 |
| spm | jml: ? | 05:51 |
| jml | lifeless, I can do that myself, actually. | 05:51 |
| spm | even better! :-) | 05:51 |
| lifeless | jml: how? | 05:51 |
| jml | lifeless, I have write permissions to the branch on launchpad. | 05:51 |
| lifeless | jml: thats not the master | 05:51 |
| spm | jml: you need access to balleny tho | 05:51 |
| jml | lifeless, I thought PQM submitting the 1.17 branch to Launchpad these days? | 05:52 |
| lifeless | jml: yes | 05:52 |
| lifeless | jml: pqm pushes there | 05:52 |
| lifeless | that doesn't make it the master | 05:52 |
| spiv | jml: btw, my fix for 400535 has landed. | 05:53 |
| jml | lifeless, what makes a branch the master branch then? | 05:53 |
| jml | spiv, thank you | 05:53 |
| lifeless | jml: the place pqm reads the branch from, which is a secured directory on the pqm server | 05:54 |
| lifeless | pqm can be configured to read from launchpad, but we haven't done that. | 05:54 |
| malibu | have you guys ever seen this happen? Its happened to me again.. no add/commit options on my working copy | 05:54 |
| jml | lifeless, ahh ok. | 05:56 |
| lifeless | malibu: no, never | 05:56 |
| lifeless | igc: Its fun, finding this many existing, hidden bugs | 05:57 |
| * SamB has never even tried to use bzr on Windows | 05:57 | |
| igc | malibu: give bzr-explorer a spin - it's a bit better supported than TortoiseBzr is currently | 05:59 |
| igc | lifeless: fun is one name for it :-) | 06:00 |
| igc | samB: that fastimport change is good - merge to trunk now | 06:00 |
| igc | SamB: ^^^ | 06:00 |
| SamB | igc: what, you think I'm case-sensitive or something? this is IRC ... | 06:01 |
| SamB | ... but how am *I* supposed to do the merge? | 06:01 |
| igc | malibu: I hope to release bzr-explorer 0.5 later tonight | 06:01 |
| lifeless | igc: found one test making a delta of | 06:01 |
| * spiv -> lunch | 06:01 | |
| lifeless | [('', '', None, InventoryDirectory(None, ...))] | 06:01 |
| igc | SamB: I did the merge. Sorry typo above | 06:01 |
| jml | spm, can you please uncommit the top revision of the 1.17 branch? | 06:01 |
| lifeless | igc: that is, a root directory with file id None | 06:01 |
| igc | lifeless: yuk | 06:02 |
| SamB | igc: oh good | 06:02 |
| SamB | that saves some awkward confusion ;-) | 06:02 |
| igc | SamB: I always assumed IRC was case-sensitive | 06:02 |
| igc | if not, you learn something new every day :-) | 06:03 |
| SamB | IGC: I suppose you do ;-) | 06:03 |
| SamB | at least, it's a pretty boring day if you don't | 06:04 |
| lifeless | abentley: don't suppose you're around? | 06:04 |
| igc | lifeless: maybe those groupcompress tests fail if make isn't run. I'll try running make and see if they go away | 06:05 |
| lifeless | igc: if they fail, I suggest we let PQM decide | 06:05 |
| SamB | igc: I found another bug and wrote a test ... would you like the test without a fix? | 06:05 |
| igc | SamB: feel free to push the branch | 06:06 |
| SamB | https://code.launchpad.net/~naesten/bzr-fastimport/401249-tag-from-ref | 06:06 |
| SamB | or lp:~naesten/bzr-fastimport/401249-tag-from-ref | 06:07 |
| igc | samB: I can't merge it to trunk though until the fix is there because 'bzr selftest fastimport' would start failing then | 06:07 |
| SamB | igc: ah. | 06:07 |
| spm | jml: to verify: uncommit+revert(?) revno 4531 in ~/archives/thelove/bzr/1.17 | 06:07 |
| jml | spm, that's right. thanks. | 06:08 |
| SamB | igc: I think I could write an ugly fix pretty easily, but in the time that it took me to figure out how to write the test, I changed my mind about wanting to do it that way ;-) | 06:09 |
| lifeless | igc: and \o/ found a form of corruption I'd overlooked | 06:10 |
| spm | jml: bzr/1.17$ bzr revno ==> 4530 | 06:10 |
| jml | spm, thank you | 06:10 |
| spm | np | 06:11 |
| igc | lifeless: those groupcompress tests pass after running make | 06:12 |
| lifeless | that needs a bug then :) | 06:14 |
| SamB | igc: well, thanks for merging that | 06:16 |
| igc | lifeless: yup, I'll raise one now | 06:19 |
| SamB | okay, how do I go back 4 revisions ? | 06:21 |
| SamB | bzr-svn is acting up :-( | 06:21 |
| igc | lifeless: so the tests pass until your patch is applied: "bzr trunk bzr.dev xx; cd xx; bzr selftest groupcompress" works fine | 06:22 |
| igc | lifeless: it's not an existing bug then I feel | 06:22 |
| lifeless | igc: thats interesting; howver I haven't touched the VFs layer, so I have to assume it just uncovers a latent bug | 06:22 |
| igc | lifeless: wouldn't be the first one with this patch :-) | 06:23 |
| SamB | ah ... bzr pull --overwrite -r 'last:5' . | 06:26 |
| SamB | what the heck ... now lp:bzr-fastimport hangs when I try to pull from it :-( | 06:36 |
| jml | spiv, can you please sanity check: http://paste.ubuntu.com/222407/ | 06:39 |
| * SamB decides to hope it goes away by morning ... | 06:40 | |
| jml | gosh it's nice being able to develop in karmic, as opposed to hardy chroot. | 06:43 |
| spiv | jml: looks ok | 06:54 |
| jml | spiv, thank you. | 06:54 |
| poolie | biab | 06:54 |
| lifeless | igc: done! | 07:06 |
| igc | lifeless: sweet. I'll take a look. | 07:11 |
| lifeless | as for the gc tests | 07:12 |
| lifeless | they have | 07:12 |
| lifeless | self.requireFeature(CompiledGroupCompressFeature) | 07:12 |
| lifeless | so they explicitly don't expect to run without the .so | 07:12 |
| lifeless | igc: I'm done for the day; if you can let me know about both merges that would be great | 07:13 |
| igc | lifeless: np | 07:14 |
| lifeless | igc: the new changes in the apply-delta branch are, a new check for the thing that was corrupt in the deltas from tree transform and test smart, and fixes to those two tests to not create bogus deltas | 07:17 |
| igc | lifeless: yup - double-clicking the entries in qlog is telling me exactly that :-) | 07:18 |
| igc | lifeless: do we allow unicode file-ids? | 07:20 |
| lifeless | no | 07:20 |
| lifeless | dirstate will barf | 07:20 |
| lifeless | we used to, but we did a sweep over the code base ages ago and redefined as utf8 strings | 07:21 |
| igc | lifeless: thanks | 07:21 |
| lifeless | theres a certain amount of 'whatever works | 07:21 |
| poolie | can we have bzr lolwhut too? | 08:06 |
| jml | I just did this: commit, push, tag, push | 08:35 |
| jml | but the final push says "No new revisions to push." | 08:35 |
| jml | am I doomed to have this tag loiter eternally in my local branch? | 08:35 |
| spiv | jml: no | 08:35 |
| spiv | jml: the message is technically correct, but misleading | 08:36 |
| spiv | jml: no *revisions* were pushed | 08:36 |
| spiv | jml: the tags should have been, though. | 08:36 |
| spiv | jml: there's a bug about this UI flaw | 08:36 |
| jml | spiv, how can I verify this? | 08:36 |
| spiv | jml: try "bzr tags -d URL" | 08:36 |
| spiv | "bzr tags -d :push", even! | 08:37 |
| jml | http://paste.ubuntu.com/222489/ | 08:37 |
| jml | I just got that error | 08:37 |
| spiv | jml: ooh, that looks like a bug! | 08:37 |
| spiv | jml: probably shallow, please file :( | 08:38 |
| * spiv needs to head off for the evening. | 08:38 | |
| spiv | jml: happy releasing! | 08:38 |
| jml | spiv, thanks. | 08:38 |
| poolie | lifeless: what is the actual point of subunit2pyunit?+ | 08:40 |
| poolie | to turn it back into the same output format produced by subunit? | 08:40 |
| lifeless | poolie: to replay a test via pyunit; this effectively gets rid of all the subunit encoding, and will tend to hide passing tests etc, depening on the pyunit parameters | 08:43 |
| poolie | actually, i meant "in your example pipeline" | 08:44 |
| lifeless | oh | 08:44 |
| lifeless | so I can see it realtime | 08:44 |
| poolie | in a nicer format than just letting subunit flow to stdout? | 08:45 |
| lifeless | yah | 08:45 |
| poolie | and as you say hiding passing tests | 08:45 |
| lifeless | well the subunit-filter takes those out, in my example | 08:45 |
| lifeless | after time reporting | 08:45 |
| lifeless | my next main thing is progress data in the stream | 08:45 |
| lifeless | once thats done I plan to do a subunit2bzrtest, or something like that, that will use bzr's progress bars to pretty-print streams | 08:46 |
| === quicksil1er is now known as quicksilver | ||
| bialix | igc: hello | 09:52 |
| jelmer | moin | 09:53 |
| igc | hi bialix - great to have you back! | 10:18 |
| igc | hi jelmer | 10:18 |
| bialix | igc: well, I'd like to be still on vacations, it was great but too short | 10:18 |
| bialix | igc: I've merged branch of amanica before I've read your objections. Should I uncommit? | 10:22 |
| igc | bialix: no | 10:22 |
| bialix | I guess we can tweak it later | 10:23 |
| igc | bialix: so how does it work exactly? I'm running trunk (1.18dev) yet that's not listed in the compatible set | 10:26 |
| igc | but I can start explorer | 10:26 |
| bialix | because bzrlib declares api_minimum_version = (1, 17, 0) | 10:27 |
| igc | bialix: so it will fail on the next api bump? | 10:28 |
| bialix | it seems so. I'll tweak the check in explorer now | 10:28 |
| === vxnick-AFK is now known as vxnick | ||
| bialix | igc: http://pastebin.com/m4419d0a1 | 10:34 |
| bialix | are you ok with error message? | 10:34 |
| igc | bialix: looks good | 10:35 |
| * bialix committing | 10:35 | |
| bialix | igc: I've downloaded latest translations and put them into trunk. it's ready to release | 10:37 |
| igc | bialix: can you test http://pastebin.com/d51aa252a for me? | 10:39 |
| igc | it's a patch for bug 394314 | 10:39 |
| ubottu | Launchpad bug 394314 in bzr-explorer "unique/missing revisions tabs should catch NotBranchError" [Medium,Confirmed] https://launchpad.net/bugs/394314 | 10:39 |
| bialix | igc: I can't test it, there is error page: Unknown post id, it may have expired or been deleted | 10:40 |
| lvh | hi | 10:41 |
| igc | bialix: try http://launchpadlibrarian.net/29273483/394314.diff | 10:42 |
| bialix | igc: it works | 10:44 |
| igc | bialix: thanks | 10:44 |
| bialix | Not a branch: file:///C:/work/Bazaar/repos/qbzr-repo-1.9/revno.769/ | 10:44 |
| bialix | though branch path cvould be better | 10:44 |
| bialix | using url_for_display | 10:45 |
| sender | can anyone help me to change the default method in tortoiseBZR checkout/branch to 'create local copy of the branch' instead of 'create a checkout'? | 10:49 |
| sender | i tracked it to line 76 of getnew.py in qbzr plugin: self.ui.but_checkout.setChecked(True) - how can i suggest/implement that this can be set by a switch? | 10:55 |
| lvh | okay, so, I branched twisted (a project) on lp, whats the first thing I do afterwards? Am I supposed to fake the directory structure I want or something? | 10:57 |
| lvh | I'm guessing I'm supposed to push something. How do I not piss off the original authors? (It's supposed to be merged, eventually | 10:57 |
| igc | sender: if you don't get a reply here, try the qbzr mailing list | 10:59 |
| poolie | lvh: i don't understand | 10:59 |
| poolie | what are you trying to do | 10:59 |
| sender | igc: tx, will do | 11:00 |
| lvh | poolie: Implementing a shiny new feature for twisted in a separate bzr branch. | 11:00 |
| poolie | ok, so: branch from launchpad to your machine | 11:00 |
| poolie | make your change | 11:01 |
| poolie | push it back to lp:~lvh/twisted/shiny-feature | 11:01 |
| poolie | then propose a merge of that branch | 11:01 |
| poolie | why would this piss them off? | 11:01 |
| igc | bialix: wrt bug 392797, can you switch on diagnostic mode and open the checkout for me? | 11:01 |
| ubottu | Launchpad bug 392797 in bzr-explorer "branch specific settings: configuration: opens wrong file for lightweight checkout" [Medium,Confirmed] https://launchpad.net/bugs/392797 | 11:01 |
| igc | bialix: is branch-root wrong there? | 11:02 |
| lvh | poolie: If I do a checkout now, it's empty -- I think that is because I havent pushed anything yet. | 11:02 |
| bialix | igc: Branch Root = file:///C:/work/Bazaar/repos/explorer/trunk | 11:03 |
| bialix | it's ok | 11:03 |
| bialix | but it's a URL | 11:03 |
| bialix | you need local path | 11:03 |
| bialix | not URL | 11:03 |
| poolie | lvh, what command are you running? | 11:03 |
| igc | bialix: it really ought to be a url there - branch.conf can be across a network | 11:04 |
| igc | bialix: something after that is incorrectly calculating the abspath | 11:04 |
| bialix | but you can't edit the file acroos network | 11:04 |
| igc | bialix: right and explorer won't let you I think | 11:05 |
| bialix | you have to download file on the disk, edit, then upload it back | 11:05 |
| bialix | my editor does not understand file:/// URL -- this is my best guess | 11:05 |
| bialix | and I think it's wrong to pass URL here | 11:05 |
| bialix | as you said explorer should not allow editing remote branch.conf | 11:06 |
| bialix | sender: it may be problemativ | 11:07 |
| bialix | sender: it may be problematic | 11:07 |
| sender | bialix: why? | 11:07 |
| bialix | sender: you can implement command line option for qgetnew command in qbzr, but then you need tell TBZR somehow to use it | 11:08 |
| bialix | another way is to implement option for qgetnew and then use aliases | 11:08 |
| bialix | I mean `bzr alias` | 11:08 |
| sender | could it become a setting? | 11:08 |
| bialix | could | 11:09 |
| bialix | but where: in qbzr or in tbzr? | 11:09 |
| sender | ideally a qbzr section under tbzr's settings item | 11:10 |
| sender | I don't know how much work that would be.. how would the alias solution work? Something like: tbzrcommand.exe --command getnew would start e.g.: tbzrcommand.exe --command getnew --default=branch | 11:12 |
| bialix | sender: I'm one of qbzr developers and I can give you some advices; but tbzr stuff you'll need to dig your self | 11:12 |
| sender | thanx for the help, it would be great to implement this | 11:13 |
| bialix | sender: basically you can define command with default options as new command or redefine the same name | 11:15 |
| bialix | sender: check help for alias command | 11:15 |
| bialix | so you can redefine qgetnew as "qgetnew --branch" or something | 11:16 |
| bialix | sender: http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#using-aliases | 11:16 |
| sender | bialix: thanx, will check that in a min. Do we need to implement --branch for qgetnew? | 11:17 |
| bialix | you can use flags like: --checkout, --branch and make --checkout as default, IMO | 11:19 |
| bialix | see RegistryOption in bzrlib.option | 11:20 |
| lvh | poolie: bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~lvh-laurensvh/twisted/positioning/". | 11:20 |
| lvh | poolie: bzr clone lp:~lvh-laurensvh/twisted/positioning | 11:20 |
| poolie | btw if that's an automatically assigned username and you want to change it, it's better to do so before you start making branches | 11:21 |
| lvh | poolie: my login name is just 'lvh' | 11:22 |
| poolie | hm | 11:22 |
| lvh | Oh, wait, found it | 11:23 |
| lvh | lvh is already in use by another person or team. :-( | 11:23 |
| poolie | https://edge.launchpad.net/~lvh-laurensvh and https://edge.launchpad.net/~lvh | 11:23 |
| poolie | that's not you? | 11:23 |
| poolie | another belgian? | 11:23 |
| lvh | wait, that's me. | 11:23 |
| poolie | https://launchpad.net/people/+requestmerge | 11:24 |
| poolie | to join them | 11:24 |
| poolie | this might be the source of some confusion | 11:24 |
| lvh | Member since: 2005-09-29 | 11:24 |
| lvh | Holy... I didn't know I registered back then | 11:25 |
| poolie | it might have been autocreated | 11:25 |
| lvh | Unfortunately I don't have access to that email address anymore so proving that I'm me is kind of hard. | 11:25 |
| poolie | then go to https://answers.launchpad.net/launchpad/+addquestion | 11:25 |
| poolie | and explain it | 11:26 |
| poolie | anyhow... | 11:26 |
| poolie | can i suggest you read through https://help.launchpad.net/Code | 11:26 |
| lvh | what's with the autocreation btw, how did that work? | 11:27 |
| lvh | okay, thanks | 11:27 |
| poolie | https://blueprints.edge.launchpad.net/launchpad-foundations/+spec/person-creation-rationale | 11:28 |
| lvh | poolie: thanks a lot! | 11:32 |
| poolie | you're welcome | 11:32 |
| sender | bialix: had a little trouble following you ;) found only a bytecode version of option (guess i need an other package) | 11:32 |
| sender | bialix: i added "qgetnew=qgetnew --branch" to [ALIASES] in bazaar.conf | 11:32 |
| sender | do i need to restart something? | 11:33 |
| bialix | sender: do you have bzr sources? | 11:33 |
| sender | bialix: it's all pyd/pyo so I guess not, will get them now | 11:33 |
| bialix | if you're using standalone bzr.exe package -- you need either download latest tarball or get the lp:bzr branch (it will take time) | 11:34 |
| bialix | then look at bzrlib\option.py, or bzrlib\builtins.py | 11:35 |
| sender | bialix: branching now | 11:37 |
| bialix | k | 11:37 |
| lvh | why should I need to wait until my merge is done before I create branches though? don't the branches move along with me? | 11:39 |
| lvh | poolie: oh, wait -- apparenty i did set my password at some time, I can log in into that account | 11:40 |
| lvh | poolie: so, change email address, then merge? | 11:41 |
| sender | bialix: something different: how hard is it to implement qpush and qpull into the context menu? | 11:45 |
| sender | bialix: the ppl i | 11:45 |
| bialix | ? | 11:45 |
| bialix | "ppl i" -- I don;t understand tyhis | 11:45 |
| sender | bialix: sorry | 11:45 |
| sender | bialix: the people I'm implementing bzr for are not so good at the command line | 11:46 |
| sender | bialix: it would be cool to add more q' commands to the context menu, if possible | 11:46 |
| bialix | have you tried bzr-explorer? | 11:46 |
| sender | bialix: nope *searching for it | 11:46 |
| bialix | context menu -- you mean context menu in Windows Explorer, I guess. | 11:46 |
| sender | bialix: yes | 11:47 |
| bialix | sorry, I don't have time to work on TBZR | 11:47 |
| bialix | sender: https://launchpad.net/bzr-explorer | 11:47 |
| sender | bialix: thanx. ok i'll look into adding to the context menu | 11:48 |
| jml | gah | 11:53 |
| jml | still releasing | 11:53 |
| jml | I am Jack's irate NEWS conflict. | 11:53 |
| lamont` | Function `PyFrozenSet_New' implicitly converted to pointer at bzrlib/_known_graph_pyx.c:941 <-- known bug in 1.17rc1, or shall I file it>? | 12:05 |
| lamont` | filed | 12:07 |
| === lamont` is now known as lamont | ||
| lifeless | lamont: function pointers are pointers ;P its in the standard! | 12:08 |
| lifeless | its also a little insane :) | 12:08 |
| lamont | lifeless: it's also fatal on 64-bit architectures | 12:09 |
| lamont | though amd64 frequently has zeros in the upper 32 bits | 12:09 |
| lamont | and undeclared functions return ints, not pointers | 12:10 |
| sender | bialix: need to reboot for bzr 1.16 to work (necessary for bzr-explorer) ... brb | 12:11 |
| igc | bialix: please try rev 184 wrt bug 392797 | 12:11 |
| ubottu | Launchpad bug 392797 in bzr-explorer "branch specific settings: configuration: opens wrong file for lightweight checkout" [Medium,Confirmed] https://launchpad.net/bugs/392797 | 12:11 |
| bialix | igc: it seems I have not pushed my better fix for check bzrlib API version | 12:14 |
| igc | bialix: right - I didn't see it come through | 12:14 |
| bialix | igc: rev 184 still not good: it tries to open path: "C:\C:\work\Bazaar\repos\explorer\trunk\.bzr\branch\branch.conf" | 12:15 |
| lamont | lifeless: that is, the function pointer was implicitly converted from a 32-bit int to a pointer there... please to tell the compiler about pointers, kthx | 12:15 |
| bialix | igc: you have to use bzrlib.urlutils.local_path_from_url instead of slicing | 12:18 |
| igc | bialix: can you send me a patch? | 12:18 |
| bialix | wait a sec | 12:18 |
| igc | bbiab | 12:22 |
| bialix | igc: how about this: http://pastebin.com/m15756be4 ? | 12:27 |
| bialix | igc: https://bugs.launchpad.net/bzr-explorer/+bug/392797/comments/4 | 12:31 |
| ubottu | Ubuntu bug 392797 in bzr-explorer "branch specific settings: configuration: opens wrong file for lightweight checkout" [Medium,Confirmed] | 12:31 |
| sender | bialix: thanx for poiting out bzr-explorer, it looks really useful, just what we need. (should it not be listed at http://bazaar-vcs.org/BzrPlugins ?) | 12:42 |
| bialix | I'm surprised if it not there | 12:43 |
| bialix | igc: why you don't add explorer to http://bazaar-vcs.org/BzrPlugins? | 12:44 |
| igc | bialix: just haven't got to it. Besides, it should soon be good enough to make the home page :-) | 12:45 |
| igc | bialix: right at the top :-) :-) | 12:45 |
| bialix | :-D | 12:45 |
| TheJosh | Does anyone know how to get bzr+ssh to have a umask of 002 on uploaded files? Should I be hunting around in the SSH docs, or the BZR docs? | 13:12 |
| TheJosh | I would prefer if I could set it up once on my server and all users would be forced to use that umask | 13:16 |
| LarstiQ | TheJosh: I'd go with posix ACLs | 13:17 |
| sender | can anyone help me to start a new translation of bzr explorer? | 13:19 |
| === jml changed the topic of #bzr to: Bazaar version control system | 1.17 released 20th July, 2009 | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | ||
| TheJosh | what if I cannot use ACLs? I am running a VPS, and the physical server does not allow me to repartition or change my root partition mount options | 13:26 |
| TheJosh | because its running OpenVZ | 13:27 |
| TheJosh | Actually I did some more investigating. It may be possible :) | 13:30 |
| jml | g'night folks. | 13:31 |
| jml | enjoy bzr 1.17 | 13:31 |
| TheJosh | cool got ACLs working - as far as I can tell. | 13:40 |
| rocky | don't suppose there's a good writeup on the 2a repo format someplace other than the couple notes in release notes? | 13:50 |
| james_w | try the devnotes branch | 13:51 |
| james_w | I think there is something in there | 13:52 |
| james_w | or doc/developers in bzr.dev perhaps | 13:52 |
| DaffyDuck_ | new bazaar user here. Let's say I have a server which is where my "central" storage is. I create a bazaar project on the server, and then from my workstation run "bzr brach bzr+ssh://server.com/foo/bar".. | 14:01 |
| DaffyDuck_ | I now have a local branch to work on. | 14:01 |
| DaffyDuck_ | But it's on my server that all the heavy backups are created, so I want to push my changes to it from time to time. | 14:02 |
| DaffyDuck_ | I can use "bzr push bzr_ssh://server...." for that,. | 14:02 |
| Arrrgh | hi guys. anyone knows - does Bzr support labels in any way? | 14:02 |
| beuno | Arrrgh, you mean tags? | 14:03 |
| Arrrgh | yes | 14:03 |
| beuno | DaffyDuck_, yes, you can both push and pull | 14:03 |
| beuno | Arrrgh, yes, "bzr help tags" | 14:03 |
| DaffyDuck_ | However, if \'ve understod it correctly, the "parent" is stored somewhere in my local repository. Is there a way I can just type "bzr push", and it'll know where to push it? | 14:03 |
| rocky | jelmer: if i specify tags and branch directly in subversion.conf, will bzr still check parent paths? (i'm still getting 403 error) | 14:04 |
| DaffyDuck_ | I accidentiallly made a typo, so rather than updating the project on the server, it created a new branch. | 14:04 |
| Raim | DaffyDuck_: use bzr push --remember $URL once and then you can use just bzr push | 14:04 |
| DaffyDuck_ | Raim: Ah! Thanks! | 14:05 |
| Arrrgh | so they just named it in other way. thanks very much | 14:05 |
| malibu | Hey there.. I'm trying to do a commit and I'm getting a memory error? | 14:17 |
| malibu | Does bzn have memory issues? | 14:17 |
| malibu | It gets to the point where it is collecting changes and then fails with a memory error | 14:17 |
| bob2 | how big a commit? | 14:18 |
| malibu | 4.6 Gb | 14:19 |
| beuno | right, I can see you running out of memory with commits that size | 14:20 |
| lifeless | malibu: is that a single file? | 14:20 |
| malibu | no, many files | 14:20 |
| lifeless | memory usage in bzr commit can spike, but per-file | 14:20 |
| lifeless | whats the largest file you're committing? | 14:21 |
| malibu | So it's hitting a single big file | 14:21 |
| malibu | 60Mb is the biggest file | 14:22 |
| malibu | No sorry 618 Mb | 14:23 |
| malibu | I didn't need it, got rid of it and will try again | 14:24 |
| malibu | So what is the biggest file bazaar can handle? | 14:26 |
| lifeless | the answer varies depending onw hat you're doing and what bzr format you're using | 14:26 |
| lifeless | but between 1/4 and 1/2 of your system memory | 14:27 |
| rocky | jelmer: in case you come around, i've debugged the problem with the 403 a bit more and no longer believe it has to do with bad branches/tags locations or anything | 14:29 |
| jelmer | rocky: hi | 14:31 |
| rocky | jelmer: it looks like bzr is checking for lock files at the root of the "repo base" which in the case of this svn repo, i don't have access to | 14:32 |
| jelmer | rocky: yeah, bzr-svn will access parent paths | 14:32 |
| rocky | i only have access a part of the rpeo | 14:32 |
| rocky | *repo | 14:32 |
| jelmer | rocky: we need access to the root of the repository for the cache? | 14:33 |
| jelmer | s/?// | 14:33 |
| jelmer | rocky: please try disabling the cache | 14:34 |
| rocky | jelmer: no diff | 14:36 |
| jelmer | rocky: you'll also need to explicitly specify where the branches are in that case | 14:36 |
| jelmer | rocky: as bzr-svn won't be able to guess if it doesn't have access to the repository root | 14:36 |
| rocky | jelmer: that's just by setting "branches =" for the repo in subversion.conf right? | 14:37 |
| jelmer | rocky: yes | 14:37 |
| rocky | what are the branch paths relative to? to the hostname or to the full url to the repo? | 14:38 |
| jelmer | the repository root | 14:38 |
| rocky | same error, i've tried variations on the branches param, etc | 14:40 |
| jelmer | rocky: please run with -Dtransport and see what it's trying to do in ~/.bzr.loig | 14:40 |
| rocky | jelmer: http://cluebin.appspot.com/pasted/403472 | 14:43 |
| dvheumen | Hi, is anyone familiar with this issue? (I couldn't find anything in the bugtracker, or it wasn't similar enough.) I did 'bzr upgrade' on a branch of lp:bzr and I got a message that the branch was converted, followed by a 'cannot convert to format' error. And the resulting branch is of 'unnamed' format. http://pastebin.com/m475f0eca | 14:43 |
| dvheumen | bzr version 1.17, just installed it | 14:44 |
| Kobaz | how do i unmerge | 15:17 |
| Kobaz | i did some stuff in the wrong order, and now i have local changes mixed in with a merge | 15:17 |
| jelmer | rocky: Hmm | 15:21 |
| jelmer | rocky: please file a bug | 15:21 |
| jelmer | rocky: bzr-svn shouldn't use the standard locking class as that attempts to do a stat on the root of the repositor when opening a branch | 15:21 |
| james_w | hey jelmer | 15:22 |
| jelmer | hi James | 15:27 |
| * jelmer waves from DebCamp | 15:27 | |
| DaffyDuck_ | Are push operations atomic? | 15:36 |
| malibu | Hi there.. I was wondering if someone could help me out. I installed TortoiseBZR but my folder icons aren't changing and my context menu isn't adapting to handle a working copy | 15:36 |
| malibu | ..although I can do a commit from the command line | 15:36 |
| beuno | DaffyDuck_, yes (commit actually is atomic) | 15:36 |
| DaffyDuck_ | beuno: Excellent. Thanks! | 15:37 |
| james_w | jelmer: how is DebCamp? | 15:41 |
| jelmer | james_w: very nice | 15:49 |
| james_w | good | 15:49 |
| james_w | jelmer: I'll see you on Thursday (I hope). | 15:49 |
| jelmer | james_w: cool | 15:50 |
| fullermd | Whee, lots of plist churn in 1.17... | 16:11 |
| luks | jelmer: I have a plugin that prints diff in svn format and I'd like to automatize some things. is there something in bzr-svn that can tell me svn revno of a bzr revision (assuming a mainline revision)? | 16:14 |
| igc | night all | 16:15 |
| jelmer | 'night Ian | 16:15 |
| jelmer | luks: what do you mean with svn format? | 16:16 |
| jelmer | luks: isn't the diff format of svn just unified diffs? | 16:16 |
| luks | jelmer: exactly what "svn diff" produces | 16:16 |
| luks | it's for review board | 16:16 |
| jelmer | luks: ah | 16:16 |
| luks | I need to include svn revision numbers and so far I've been entering them manually | 16:16 |
| jelmer | luks: in that case, it would be nice I guess if we could integrate this into "bzr send --format=svn" | 16:16 |
| jelmer | luks: but yeah, this information is available if you use bzrlib.foreign | 16:17 |
| luks | jelmer: I found bzrlib.foreign, but it seems to work only for revisions from svn (but it's very likely I'm missing something) | 16:18 |
| luks | my main use case are revisions coming from bzr, pushed to svn | 16:18 |
| luks | ie, they don't have ids in the bzr-svn format | 16:18 |
| jelmer | luks: you can only get the svn revno for those if you have access to the related svn repository | 16:19 |
| jelmer | since there is no canonical svn revno for those revisions | 16:20 |
| luks | jelmer: yeah, I meant something that talks to the svn repository | 16:20 |
| jelmer | e.g. you could push one bzr revision to two svn repositories and it would end up with two different svn revno's | 16:20 |
| luks | jelmer: SvnRepository.lookup_revision_id seems to be what I was looking for | 16:35 |
| luks | I didn't know bzr send can output different formats, I'll look into that | 16:36 |
| terry | hi guys. i install bzr on windows use windows installer, but when install finish, i can't find bzrlib in site-packages . how can i get it. thanks | 17:19 |
| === NfNitLoo` is now known as NfNitLoop | ||
| SamB | hmm ... am I the only one who can't pull from lp:bzr-fastimport over bzr+ssh? | 17:58 |
| luks | jelmer: lookup_revision_id seems to work fine -- http://paste.pocoo.org/show/129745/ (you probably don't want to see this though :)) | 17:59 |
| === jfroy_ is now known as jfroy | ||
| === photon is now known as lol | ||
| === lol is now known as photon | ||
| jelmer | luks: ooh, neat | 20:20 |
| jelmer | SamB: what breaks? | 20:20 |
| abli | Hi! do I have to set the file/directory permission on a repository that multiple people will use? Might such permission problem be the cause of getting "Cannot lock LockDir" permission denied errors when trying to do a "bzr heckout"? | 20:27 |
| LarstiQ | abli: possibly | 20:29 |
| abli | is it documented somewhere? (what permissions to set?) | 20:29 |
| LarstiQ | abli: I recommend using posix acls (`setfacl` and friends) to get rid of that problem | 20:30 |
| LarstiQ | abli: well uhm, standard unix permissions apply | 20:30 |
| jelmer | luks: It'd be awesome to see a merge request for this :-) | 20:31 |
| luks | jelmer: are you serious? do you want to monkey patch bzrlib in bzr-svn? | 20:31 |
| LarstiQ | jelmer: you're not denting about Debcamp/conf enough! ;P | 20:32 |
| SamB | jelmer: bzr just hangs waiting for a response | 20:32 |
| SamB | jelmer: would you like to see an strace? | 20:33 |
| jelmer | LarstiQ: :-) | 20:33 |
| jelmer | luks: I missed that bit :-) | 20:33 |
| luks | the other option is refactoring the diff writing code in bzrlib | 20:34 |
| luks | which is something I'm not going to do | 20:34 |
| jelmer | luks: where is the monkey patching happening? | 20:34 |
| luks | DiffText.diff = DiffText_diff | 20:34 |
| luks | I'm temporarily changing the DiffText class to do what I want | 20:34 |
| luks | I'd have to duplicate a *lot* of code if I wanted to do it properly | 20:35 |
| luks | or I'd have to fix bzrlib | 20:35 |
| jelmer | luks: fixing bzrlib shouldn't be too hard I think | 20:35 |
| luks | yeah, but I lost all my hope in bzr development process :) | 20:36 |
| jelmer | luks: Oh, ok | 20:36 |
| luks | so I'd rather not go there | 20:36 |
| jelmer | luks: Can you perhaps just file a merge request against bzr-svn and I'll take it from there? | 20:36 |
| luks | jelmer: ok, I'll clean it up, add some tests and submit it | 20:36 |
| jelmer | SamB: not particularly :-) I was just asking because it might be some easy problem | 20:37 |
| SamB | jelmer: what happens when you try to access it? | 20:37 |
| SamB | anyway, I was just suggesting strace because I don't know any other way to trace what goes between the SSH client and bzr | 20:38 |
| jelmer | SamB: seems to work fine here | 20:38 |
| SamB | jelmer: huh | 20:38 |
| LarstiQ | hmeland_: yow! | 20:56 |
| LarstiQ | hmeland_: someone reported having '' in sys.path with jaunty python 2.6.2, which python were you using? | 20:56 |
| DaffyDuck_ | If I have branched a repository, and edited locally, and made several changes -- how do I push the changes to the server without all of the history? (I essentially want one change only on the server though I have several on my workstation). | 21:03 |
| LarstiQ | DaffyDuck_: I can probably think of something for that, but it usually isn't what one wants. Can you explain why you want to do that? | 21:04 |
| LarstiQ | DaffyDuck_: ie, why isn't just merging the work enough? | 21:05 |
| DaffyDuck_ | LarstiQ: The repository on the server is the "central" one which others will use. I don't want to bother them with my "test001", "test002", etc. :) | 21:07 |
| DaffyDuck_ | ...but I assume there are other solutions for that? | 21:07 |
| LarstiQ | DaffyDuck_: depending on the amount of bother | 21:09 |
| LarstiQ | DaffyDuck_: so if you cd to a copy of the central branch, andd then `bzr merg path/to/your/work` | 21:09 |
| LarstiQ | DaffyDuck_: and then look at `bzr log -n1` | 21:09 |
| malibu | I committed a large amount of data this morning and now I am finding that traversing my working copy is very slow. Is this normal?? | 21:39 |
| malibu | Furtthermore, folder and file icons for TortoiseBZR seem to be extremely varied. | 21:40 |
| LarstiQ | malibu: traversing how? (And no, I'd say that is not normal) | 21:49 |
| ndurner | It's very slow here, too. | 21:51 |
| ndurner | TortoiseBZR doesn't do caching like TortoiseSVN, right? | 21:52 |
| === ddaa1 is now known as ddaa | ||
| LarstiQ | ndurner, malibu: afaik TortoiseBZR does do caching | 21:59 |
| LarstiQ | but I don't have much direct experience with it | 21:59 |
| ndurner | Ah yes, there's a "tbzrcachew.exe" process running | 22:00 |
| ndurner | Odd. | 22:00 |
| LarstiQ | I do admit of having seen reports of that process running away with resources | 22:01 |
| LarstiQ | malibu: you should be able to turn either the caching or the file icons off, could you test what that does to performance? | 22:02 |
| LarstiQ | hmeland_: ah, I see you were instrumental in getting bug 72227 to a more or less resolved state, thanks! | 22:05 |
| ubottu | Launchpad bug 72227 in bzr "should avoid loading modules from working directory" [High,Invalid] https://launchpad.net/bugs/72227 | 22:05 |
| lifeless | moin | 22:06 |
| LarstiQ | moin lifeless | 22:07 |
| thumper | does anyone have any groovey icons for indicating a conflict in a branch | 22:16 |
| thumper | ? | 22:16 |
| garyvdm | thumper: None I would call groovey | 22:18 |
| LarstiQ | thumper: no, but I'd check bzr-explorer | 22:18 |
| lifeless | jml: jelmer: a review please :) - https://code.edge.launchpad.net/~lifeless/subunit/time-support/+merge/9042 | 22:25 |
| poolie | hello all | 22:48 |
| poolie | jam, still here? | 22:48 |
| ndurner | Hello poolie | 22:53 |
| ndurner | I have filed the proposal to merge here: https://code.launchpad.net/~ndurner/bzr/bzr-ftp/+merge/8906 | 22:53 |
| ndurner | Is there anything else (besides the testcase) I have to to? | 22:53 |
| poolie | looks good nils | 22:58 |
| poolie | i'll comment on the review | 22:58 |
| ndurner | great, thanks! | 22:59 |
| jml | lifeless, I've got it flagged to do later. | 23:00 |
| lifeless | jml: thanks | 23:00 |
| poolie | hi lifeless, jml, thumper | 23:01 |
| lifeless | hi poolie | 23:02 |
| thumper | hi poolie | 23:04 |
| etank | im looking at trying to set up a shared repo on my server. looking at the docs it says to 'mkdir /srv/bzr/ | 23:18 |
| etank | what user should own the bzr dir? | 23:18 |
| etank | should i set up the /srv/bzr/foo as root? | 23:19 |
| DaffyDuck_ | etank: If it's shared, it's more a question about group ownership. | 23:19 |
| etank | so i should add a group and add users to it that need the access | 23:20 |
| DaffyDuck_ | etank: Yes. | 23:20 |
| etank | i see | 23:20 |
| etank | thanks DaffyDuck_ | 23:20 |
| DaffyDuck_ | There's a really good page I found. Hang on, and I'll see if I can find it again. | 23:20 |
| DaffyDuck_ | etank: http://bazaar-vcs.org/SharedRepositoryTutorial | 23:21 |
| etank | yeah thats what im reading now | 23:21 |
| DaffyDuck_ | Ah. :) | 23:21 |
| etank | crud. i was one paragraph away from the answer :) | 23:21 |
| DaffyDuck_ | I figured something like that -- it's right at the bottom. | 23:22 |
| etank | yeah i see that now | 23:22 |
| etank | i should be more patient | 23:22 |
| DaffyDuck_ | etank: I did the same thing -- ask first, find five seconds later. :) | 23:23 |
| etank | glad im not the only one | 23:23 |
| easy4 | I made some changes to the files in my trunk branch and now I want to create a new branch with these changes and revert trunk to the most recent commit. What's the easiest way to do that? | 23:28 |
| DaffyDuck_ | easy4: I have no idea, but I'd probably commit, branch and then uncommit in trunk. | 23:29 |
| lifeless | easy4: have you committed the changes? | 23:29 |
| lifeless | easy4: if not: | 23:29 |
| DaffyDuck_ | ..but I'd backup first, since I'm new to bazaar, and I don't really know what I'm doing. | 23:30 |
| lifeless | bzr branch . ../new-branch; cd ../new-branch; bzr merge ../trunk --uncommitted | 23:30 |
| lifeless | easy4: if you *have* committed: | 23:30 |
| lifeless | bzr branch . ../new-branch | 23:30 |
| lifeless | bzr uncommit | 23:30 |
| lifeless | bzr revert | 23:30 |
| easy4 | i see. thanks | 23:31 |
| lifeless | igc: so, the good news is - your branch fails in real world tests - e.g. | 23:46 |
| lifeless | robertc@lifeless-64:~/source/baz/pending/igc-commit$ bzr commit -m "foo" doc/developers/foo | 23:46 |
| lifeless | Committing to: /home/robertc/source/baz/pending/igc-commit/ | 23:46 |
| lifeless | added doc | 23:46 |
| lifeless | added doc/developers | 23:46 |
| lifeless | added doc/developers/foo | 23:46 |
| lifeless | aborting commit write group: InconsistentDelta(An inconsistent delta was supplied involving u'doc', 'doc-20050309044934-a811c79dd26eef58' | 23:46 |
| lifeless | reason: Path already versioned) | 23:46 |
| lifeless | bzr: ERROR: An inconsistent delta was supplied involving u'doc', 'doc-20050309044934-a811c79dd26eef58' | 23:46 |
| lifeless | reason: Path already versioned | 23:46 |
| lifeless | igc: this means that all the paranoia wasn't waste ;) | 23:46 |
| lifeless | igc: the better news is that I've nothing listed as a pre-requisite for this now | 23:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!