| lifeless | jelmer: what is 'discovering revisions' in a bzr-svn branch operation | 00:08 |
|---|---|---|
| lifeless | jelmer: after the tip of the output branch is set | 00:08 |
| jfroy | jelmer: hey, push is still broken :/ | 00:18 |
| jfroy | pushing to an existing branch emits "Created new branch." no matter what | 00:19 |
| jfroy | And --remember seems to be ineffective | 00:20 |
| jfroy | Filed: https://bugs.launchpad.net/bzr-svn/+bug/355914 | 00:27 |
| ubottu | Launchpad bug 355914 in bzr-svn "bzr push always reports that it created a new branch and --remember is ineffective" [Undecided,New] | 00:27 |
| igc | morning | 00:31 |
| lifeless | hi igc | 00:36 |
| lifeless | jml: python commit - 71208 ;) | 00:37 |
| lifeless | small steps | 00:37 |
| igc | hi lifeless, jml | 00:40 |
| jml | igc: hello | 00:41 |
| kingos | hi, I have a possible bug, and I am wondering if anyone wants to help me :) | 01:12 |
| lifeless | probably, but just ask | 01:13 |
| kingos | it seems to be similar to a lot of other bugs, especially #295611 | 01:14 |
| kingos | I try and do a bzr upgrade --1.9, and it fails with that NoSuchRevision exception. | 01:14 |
| kingos | I am using bzr-1.13 | 01:14 |
| lifeless | what does 'bzr info -v' report? | 01:14 |
| kingos | bzr info -v | 01:14 |
| kingos | Format: | 01:14 |
| kingos | control: Meta directory format 1 | 01:14 |
| kingos | branch: Branch format 5 | 01:14 |
| kingos | repository: Packs containing knits without subtree support | 01:14 |
| lifeless | does 'bzr check' succeed? | 01:15 |
| kingos | um. | 01:16 |
| kingos | not sure. | 01:16 |
| AfC | Good answer | 01:16 |
| kingos | We could be here for a while. | 01:16 |
| kingos | 31219 revisions. | 01:16 |
| kingos | running | 01:16 |
| kingos | I *thought* I ran it before and it didn't return any errors. | 01:17 |
| kingos | I imagine this could take a few hours | 01:17 |
| kingos | Should I come back when it is finished? | 01:18 |
| jfroy | jelmer: push reports that there are no revisions to pull now :p | 01:20 |
| lifeless | kingos: please | 01:24 |
| lifeless | kingos: you're welcome to remain here in the interim of course :) | 01:24 |
| ivan | I'm trying to clone http://bzr.notengoamigos.org/emacs/trunk/ but bzr ate all my memory | 01:30 |
| ivan | It hasn't written a single byte into the pack file yet | 01:30 |
| ivan | anything I can do besides more memory? | 01:31 |
| ivan | using 506MB RSS | 01:31 |
| lifeless | ivan: emacs is very big; we're bringing in a bunch of changes of the next couple of releases that will help a lot | 01:33 |
| ivan | cool, I will relax until then | 01:34 |
| AfC | "bzr ate my memory" ... that's better than "the dog ate my homework" | 01:34 |
| AfC | ivan: no idea if this will help, but something I had to do when converting things like GTK from svn to bzr was to work in smaller chunks | 01:35 |
| AfC | (this was due to Subversion's server crashing, not Bazaar's problem) | 01:35 |
| AfC | by doing | 01:35 |
| AfC | $ bzr init . | 01:35 |
| AfC | $ bzr pull -r 100 URL | 01:35 |
| AfC | $ bzr pull -r 200 URL | 01:35 |
| AfC | and so on. Yes, I used a loop and expr :) | 01:35 |
| lifeless | ivan: the bulk of that 500MB is probably index handling, that branch is in our default format which is quite memory hungry | 01:36 |
| lifeless | igc: so, more bbc today | 01:36 |
| AfC | [interestingly, Subversion is horrible at accessing historical revisions; it took over 30 minutes for svn to dig out 100 revisions at first. This dropped to 9 minutes at the end. Unreal] | 01:37 |
| AfC | lifeless: (maybe we should politely encourage someone there to upgrade it?) | 01:37 |
| ivan | i've crashed svn servers pulling history | 01:37 |
| ivan | well, just one :) | 01:38 |
| ivan | AfC: seems to be working great, thanks | 01:40 |
| igc | lifeless: absolutely - on it now | 01:40 |
| igc | lifeless: next review will be for the intertree stuff | 01:40 |
| lifeless | igc: what are you waiting on me for | 01:44 |
| lifeless | spiv: ping; want to work together today? | 01:44 |
| igc | lifeless: nothing yet. I'm hoping you or poolie are chasing that legal issue though | 01:45 |
| lifeless | poolie is still on leave | 01:45 |
| igc | lifeless: back tomorrow then? | 01:45 |
| igc | I had assumed it was today | 01:45 |
| igc | lifeless: looks like poolie is back Wed | 01:47 |
| lifeless | yes | 01:48 |
| kingos | 10% through | 01:57 |
| lifeless | spiv: ping | 02:22 |
| spiv | lifeless: pong | 02:22 |
| lifeless | 10:40 < lifeless> spiv: ping; want to work together today? | 02:23 |
| lifeless | also, do I remember correctly that my set_config_option patch was approved by you? | 02:23 |
| spiv | lifeless: yes, and BB should remember that for you too ;) | 02:23 |
| spiv | lifeless: I think I'd rather work by myself today. | 02:25 |
| lifeless | spiv: cool | 02:27 |
| lifeless | spiv: you're working on the critical bug yeah? | 02:27 |
| spiv | Yeah. | 02:27 |
| lifeless | if you need any assistance shout out | 02:27 |
| lifeless | I think you'll need to patch the code that does seen_parents = ... | 02:28 |
| lifeless | to determine that [some] parents are unavailable and now try to read them etc | 02:29 |
| lifeless | spiv: and I agree, 1.13.2 is a good idea | 02:29 |
| * spiv ndos | 02:31 | |
| spiv | nods, even | 02:31 |
| * igc food | 02:50 | |
| kingos | lifeless: bzr check fails | 02:56 |
| kingos | bzr: ERROR: exceptions.KeyError: | 02:56 |
| kingos | that sounds bad | 02:57 |
| lifeless | kingos: well it means the problem is not related to upgrade | 02:57 |
| lifeless | is this a bzr-svn converted branch? | 02:57 |
| jelmer | lifeless: "discovering revisions" after setting the branch tip means it's determining the revids to use for tags | 03:47 |
| jelmer | lifeless: the InterBranch.pull() branch I submitted pretty much eliminates that | 03:48 |
| lifeless | ok | 03:50 |
| fullermd | Hm. | 03:51 |
| fullermd | So, assume I have two branches with shared history, but one has gone way off in its own direction since they diverged. | 03:52 |
| fullermd | If, in the "older" one, I do a merge --uncommitted, is it going to pull all those revs into its repository before it does its thing in the WT? | 03:52 |
| fullermd | (and/or the same Q with cherrypicks) | 03:57 |
| lifeless | no | 03:58 |
| lifeless | or | 03:58 |
| lifeless | maybe | 03:58 |
| fullermd | Hm. 'k. | 03:59 |
| fullermd | 'cuz I've got this branch that should have (and does have) a completely linear history. It also has | 03:59 |
| fullermd | Branch history: | 03:59 |
| fullermd | Repository: | 03:59 |
| fullermd | 502 revisions | 03:59 |
| fullermd | 28 revisions | 03:59 |
| fullermd | Was trying to figure out how they got crammed in there... | 03:59 |
| lifeless | probably that | 04:00 |
| fullermd | I have done one or the other of --uncommitted and cherrypicks into it, so... | 04:00 |
| lifeless | they won't propogate on push.pull | 04:00 |
| fullermd | Or indeed commit (this being a checkout) | 04:00 |
| fullermd | Which is slightly weird. It suggests that would be another difference in what happens where between light/heavy checkouts :| | 04:01 |
| lifeless | igc: would a phone call about the format names help? | 04:30 |
| igc | lifeless: not at this point - I'm about to have lunch and I'm deep in other stuff | 04:33 |
| igc | lifeless: I'd also like to hear from others beyond you and I | 04:33 |
| * fullermd prefers serial numbering. | 04:34 | |
| lifeless | jelmer: ping | 04:36 |
| * igc lunch | 04:37 | |
| === lamont` is now known as lamont | ||
| === jamesh_ is now known as jamesh | ||
| kingos | lifeless: no, not bzr-svn | 04:44 |
| kingos | has been around a long long time. | 04:45 |
| kingos | has had everything done to it at various points in time | 04:46 |
| kingos | eg. uncommit | 04:46 |
| kingos | etc. | 04:46 |
| lifeless | kingos: please file a bug, I'll generate a little script to get details about whats going on | 04:47 |
| kingos | urgh ok | 04:49 |
| kingos | lost the output | 04:49 |
| lifeless | it may be in ~/.bzr.log | 04:49 |
| Peng_ | igc: FWIW, I don't like 1.15-development, but development-1.15 seems okay to me. But I'm still happy with development6. | 04:50 |
| AfC | Is there a way to stop bzr from adding [merge] when it's giving single line summaries (log, missing, etc) of revisions that just happen to be merges? | 06:16 |
| AfC | It's quite annoying. If I wanted that text in the commit message I would have added it. | 06:17 |
| igc | AfC: not currently. It there to tell users that there's interesting stuff under that revision | 06:19 |
| kingos | hmmm. bzr check seems to have gotten further than last time. | 06:20 |
| igc | I guess we could suppress it if you've given -n0 though | 06:20 |
| igc | AfC: And the text isn't in the commit message (it's just shown before it) | 06:21 |
| AfC | igc: come on, mate. You know what I mean. | 06:22 |
| AfC | igc: incidentally, this is the second time I've seen you mention this "-n0" thing. What is that? I don't see it on the help of `bzr missing` | 06:24 |
| igc | AfC: missing doesn't support it yet - it has --include-merges though (which is the same thing) | 06:25 |
| Talden | It would be good to suppress it if we're going to show those revisions anyway. That is, if we've asked for the next depth of revisions we don't show [merge]. I also wonder, given that --line is supposed to be quite terse, that another indicator than [merge] (7 characters) might be used. | 06:25 |
| igc | AfC: see bzr help log | 06:25 |
| AfC | Ah | 06:26 |
| AfC | Well, that's fine and nice for `log`. Not much use for the other commands. | 06:26 |
| AfC | Anyway, if we could have a global config option to stop bzr adding decorations that we didn't ask for, that'd be great. | 06:26 |
| thumper | if I want to merge in a branch but only to a specified revno, can I just go "bzr merge ../other-branch -r 1234" ? | 06:28 |
| spiv | thumper: yes | 06:28 |
| thumper | spiv: ta | 06:29 |
| Talden | Don't you want it to be a range of revisions - or it's a cherry pick I thought | 06:29 |
| * Talden is a bzr noob - you have been warned... | 06:29 | |
| Talden | Ahh no a range of a single rev is cherry pick... | 06:30 |
| spiv | Talden: if you give a single revision rather than a range to merge it'll assume you want all the revisions upto and including the specified revision. | 06:31 |
| spiv | It's only if you specify a range that you can get a cherrypick. (And even then, if you choose a range that is forwards and connected/overlapping your current ancestry then bzr will treat it as a regular merge rather than a cherrypick) | 06:32 |
| kingos | lifeless: bug filed as #356028 | 06:33 |
| kingos | lifeless? | 06:38 |
| lifeless | kingos: thanks, I'll put together a small script over the next day or two and get you to run it | 06:40 |
| kingos | lifeless: thanks. | 06:40 |
| kingos | lifeless: what are the implications of this? is our repo busted? or will we be able to fix it? | 06:40 |
| lifeless | clearly something is wrong | 06:41 |
| lifeless | the nature of that we have yet to ascertain | 06:41 |
| kingos | of course. I just thought you may have some ideas what the implications could be | 06:41 |
| lifeless | its probably that any missing content is in someones source branch | 06:41 |
| kingos | pretty scary! :) | 06:41 |
| lifeless | and once we identify it they - e.g. - tibra.com.au - can do a custom push to fix it up | 06:42 |
| lifeless | I also need to ascertain *why* you have any glitching occuring | 06:42 |
| lifeless | bzr is fairly cautious about copying your history around | 06:43 |
| lifeless | as a just in case, don't delete any old branches you have hanging around, or old repos | 06:43 |
| kingos | ok | 06:44 |
| lifeless | but normal use on an ongoing basis should be fine | 06:44 |
| lifeless | 'someemail@blah.com20080728 | 06:44 |
| kingos | so much for privacy ... left an email address in :( | 06:44 |
| lifeless | edit it now, I doubt google will have found it | 06:44 |
| lifeless | there's also a tonne of spaces | 06:45 |
| lifeless | so I doubt spammers will pickup on it | 06:45 |
| lifeless | anyhow, the key its erroring on is roughly when/where something went wrong | 06:45 |
| kingos | how do I edit it ... can't see an edit button | 06:45 |
| kingos | foudn it | 06:46 |
| kingos | thanks for your help lifeless | 06:46 |
| lifeless | np. I'm treating this as serious, but we're juggling time to get 1.14 out, which is why you're not getting the script *today* | 06:47 |
| lifeless | we have a couple of important RC bugs | 06:47 |
| lifeless | spiv: speaking of which... | 06:47 |
| lifeless | how goes it? | 06:47 |
| vila | hi all | 07:20 |
| === spm_ is now known as spm | ||
| lifeless | igc: I'm about to call it a day | 08:05 |
| igc | lifeless: ok, I'm off to the hospital tomorrow at 9am for most the day btw | 08:20 |
| lifeless | igc: good luck | 08:21 |
| igc | lifeless: thanks | 08:21 |
| igc | lifeless: I'm make a bit more progress on integrating bbc tonight but a review of the gc patch would be great tomorrow say | 08:21 |
| igc | s/I'm/I'll/ | 08:22 |
| lifeless | other than the licence question I think its landable | 08:23 |
| igc | vila: can I ask you to tweak (and land into bzr.dev) the InterCHKRevisionTree code as lifeless and jam requested in their reviews? | 08:24 |
| Peng_ | igc: "lifelessjamcompress" is a weird name. Why would you compress jam, and why would you need a different compress for jam that is alive? :D | 08:51 |
| pygi | jelmer, is bzr git supposed to do clones? | 11:00 |
| pygi | like this: bzr branch git://github.com/bla/bla.git ? | 11:01 |
| pygi | every time I try that I get random number at "Compressing objects" step... | 11:01 |
| === LenZGr_ is now known as LenZGr | ||
| herzi | alright, my ex-girlfriend wants to write her thesis and I though bazaar would be a good DVCS system for her windows + latex workflow | 12:17 |
| herzi | any recommendations on a gui for her? | 12:17 |
| === UdontKnow is now known as udk | ||
| AfC | herzi: you mean a Microsoft Windows GUI, I assume | 12:37 |
| AfC | herzi: (and not X Windows) | 12:40 |
| AfC | herzi: there is http://bazaar-vcs.org/TortoiseBzr | 12:40 |
| AfC | I have no idea if it's {complete, usable, nice to use, etc}. | 12:40 |
| Talden | Honestly... not really but it is getting better. | 12:43 |
| * AfC vaguely wonders what it is that Microsoft people DO do to work with bzr | 12:46 | |
| AfC | of course, | 12:47 |
| * AfC vaguely wonders what it is that Microsoft people DO do to do work | 12:47 | |
| jpds | lifeless: Do you have an opinion on bug #354843 ? | 12:49 |
| ubottu | Launchpad bug 354843 in bzr "Bzr should be smart about who owns ~/.bzr.log" [Undecided,New] https://launchpad.net/bugs/354843 | 12:49 |
| AfC | herzi: (sorry I couldn't be more help) | 12:51 |
| lifeless | jpds: not really, certainly it would be better to tell the user what is wrong | 12:54 |
| Talden | AfC - commandline... the odd qbzr command... I'm happy enough at the prompt - getting adoption at work though would require a good GUI or shell integration at the least and probably IDE integration for full buy-in. We have scaling issues first though that brisbane-core looks like it might resolve. | 12:59 |
| AfC | Talden: perhaps we should suggest Sven investigate QBzr on Windows, then | 13:00 |
| Talden | AIUI it takes the commandline to invoke the various qbzr dialogs. Some at my workplace seem to have some sort of allergic reaction when commandline use is mentioned (certainly there's a lot of red-faced frothing at the mouth). | 13:02 |
| jpds | lifeless: Yes, my thoughts exactly. | 13:03 |
| * Talden wanders off to bed here in NZ. | 13:04 | |
| jelmer | lifeless: pong | 13:45 |
| james_w | jpds: the immediate issue is that the warning is from an external library, and the library also provides no sensible way to determine if it just gave that error so you could add some explanatory text afterwards | 13:51 |
| Lo-lan-do | Hi all | 13:54 |
| Lo-lan-do | jelmer: Can one install bzrtools from sid on lenny with the bzr backport? | 13:54 |
| jelmer | Lo-lan-do: hi | 13:56 |
| jelmer | Lo-lan-do: I think so | 13:56 |
| jelmer | at least the versions match, I haven't tested the particular combination | 13:56 |
| Lo-lan-do | Blargh | 13:58 |
| Lo-lan-do | bzrtools: Depends: python-central (>= 0.6.11) but 0.6.8 is installed. | 13:58 |
| jelmer | Lo-lan-do: Is there anything particular from bzrtools you need? | 13:59 |
| jelmer | Lo-lan-do: shelve and clean-tree were moved into bzr core from bzrtools | 14:00 |
| Lo-lan-do | Let's remove it then, see if anybody complains :-) | 14:00 |
| Bluehorn | james_w: Hi James. Aren't you the guy who created package-import.ubuntu.com? | 14:29 |
| james_w | Bluehorn: yup | 14:29 |
| Bluehorn | james_w: I am trying to get a package of mine imported into bzr, and bzr dsc-import does not cut it for me. | 14:30 |
| Bluehorn | james_w: Is the code for package-import somewhere available? | 14:30 |
| james_w | it just uses dsc-import under the hood | 14:30 |
| Bluehorn | Because I like the package-import setup - having a distinct upstream branch etc. | 14:30 |
| Bluehorn | hmm, okay. how do you get the seperation into package-upstream and package-{hoary/warty/you-name-it}? | 14:31 |
| Bluehorn | james_w: BTW: Great work. Actually having bzr repos for most ubuntu packages makes it interesting to use bzr for me - so that the exchange Ubuntu<->Debian can go faster. | 14:32 |
| james_w | ah | 14:33 |
| james_w | I just create the upstream branch by hand afterwards actually | 14:33 |
| Bluehorn | Manually, for all packages? Or do you have a script for that? | 14:34 |
| james_w | yeah, it's part of the driver script | 14:35 |
| james_w | once you have done dsc-import it's easy to find the tip of the upstream branch via it's tag, and this can be branched/pulled out | 14:36 |
| Bluehorn | james_w: May I ask if the driver script is available somewhere? ;-) | 14:37 |
| james_w | it's not currently | 14:37 |
| Bluehorn | james_w: Would save me some time, I already tried to change dsc-import to support an upstream branch (and to use a shared repo), but I did not dig through the bzr python api fast enough. | 14:38 |
| luks | package-import.ubuntu.com seems to have messed up unicode for maintainer names | 14:38 |
| james_w | luks: do you have an example? | 14:38 |
| Bluehorn | james_w: okay, thank you anyway. | 14:38 |
| Bluehorn | james_w: I'll try to reproduce the "pull out upstream" functionality. | 14:38 |
| luks | http://package-import.ubuntu.com/libd/libdiscid/hardy/changes | 14:38 |
| james_w | Bluehorn: thanks for the feedback | 14:38 |
| james_w | luks: thanks, I'll look in to that | 14:39 |
| luks | it's utf8 in debian/changes, seems to be parsed as latin1 | 14:39 |
| luks | *changelog | 14:39 |
| Bluehorn | luks: probably dependent on the current user locale... ;-) | 14:41 |
| luks | yeah, not a good solution if you are importing the whole distro | 14:41 |
| === ja1 is now known as jam | ||
| BarryRWUK_ | Hi All, I have a problem using Bazaar when sending files using FTP. Apparently my hosts ftp server doesn't support the APPE command. Is there a way around this? | 16:38 |
| === udk is now known as UdontKnow | ||
| fallenpegasus | how do i change a default parent like doing --rememeber, without actually doing the pull? | 18:32 |
| Tak | fallenpegasus: can you do something like: `bzr pull -r latest-local-revision --remember /foo/bar` ‽ | 18:36 |
| jelmer | fallenpegasus: you can edit .bzr/branch/branch.conf | 18:37 |
| fallenpegasus | thanks! | 18:41 |
| BasicOSX | Is there a delay from when you push to LP to when PQM can access it? | 19:00 |
| LarstiQ | BasicOSX: yeah | 19:06 |
| LarstiQ | BasicOSX: you can test that by accessing it via http | 19:07 |
| === beuno_ is now known as beuno | ||
| BasicOSX | ok, that explains why I push to lp, the pqm submit and pqm yells at me with a "non-PQM managed branch" | 19:29 |
| === beuno_ is now known as beuno | ||
| theAdib | hello all, someone send a diff to me via email starting "# Bazaar merge directive format 2 (Bazaar 0.90)" ... . What do I have to do now? | 20:10 |
| jelmer | theAdib: "bzr merge <filename>" | 20:11 |
| jelmer | theAdib: or "bzr pull <filename>" | 20:12 |
| LarstiQ | theAdib: assuming you are using bzr | 20:13 |
| LarstiQ | hey jelmer! | 20:13 |
| theAdib | cool: bzr pull foo.patch worked thanks | 20:14 |
| LarstiQ | theAdib: good :) | 20:14 |
| LarstiQ | theAdib: generated by `bzr send` btw | 20:14 |
| james_w | would putting a sentence in the header make sense? | 20:16 |
| james_w | either a pointer to a help topic, or "you can use bzr merge <filename>" or something? | 20:17 |
| BasicOSX | PQM failures are back for me, nothing different from the last time I submitted. Error here: http://www.nopaste.com/p/aLsVQmm8v | 20:19 |
| LarstiQ | james_w: yeah, I think so | 20:26 |
| jelmer | LarstiQ: dude! | 20:27 |
| LarstiQ | jelmer: I'm not dead yet! | 20:27 |
| jelmer | LarstiQ: how are things? | 20:35 |
| jelmer | vila: pingz0rz | 20:35 |
| vila | BasicOSX: replace your lp url by an http one (I had troubles with PQM and lp urls, different than yours, but worth a try) | 20:37 |
| vila | jelmer: pong | 20:37 |
| LarstiQ | jelmer: Anu came to visit from 26th of march till 3 april | 20:37 |
| LarstiQ | jelmer: back to long working hours now | 20:38 |
| LarstiQ | vila: a colleague of mine has (recently) done some work to build on httplib (and urllib2 a bit iirc) to make it do things we need, more than just GET | 20:41 |
| LarstiQ | vila: ie PUT, 100-continue, and I forget more | 20:41 |
| jelmer | vila: I was wondering if you had any more feedback on my username patch :-) | 20:41 |
| LarstiQ | vila: would you be interested in discussing with him possibly joining forces? Since Bazaar beefs up stdlib in that area as well. | 20:42 |
| * LarstiQ would ideally want to upstream it all the way to Python, but maybe a good library on top of it is more feasible | 20:42 | |
| vila | jelmer: no time today, but roughly, except for maybe a s/password/user/ it sounded good, I hope to review it tomorrow | 20:44 |
| jelmer | LarstiQ: Ahh, that explains your sudden quietness on IRC (-: | 20:44 |
| vila | LarstiQ: certainly | 20:45 |
| jelmer | vila: Cool, thanks :-) | 20:45 |
| vila | the urllib based implementation shows its limits, replacing it by an enhanced httplib is the way to go (urllib2 is targeted at *downloading* *one* url, not the fundation I will chose today if I was starting again) | 20:46 |
| LeoNerd | Ooooh the new 'bzr shelve' is now in my debian/testing desktop... | 20:46 |
| LeoNerd | Finally | 20:46 |
| vila | LarstiQ: httplib is more oriented to connection handling like we need | 20:46 |
| vila | LarstiQ: but bzr-webdav already has PUT and some more :-) (It even had 100-continue at one point :) | 20:47 |
| jelmer | LeoNerd: yeah, the new shelve is really neat | 20:48 |
| LeoNerd | It's cute... it can .. like.. actually cope with pending-add and pending-delete now | 20:48 |
| LeoNerd | And it doesn't litter .shelf about the place | 20:48 |
| jelmer | LeoNerd: it can even shelve renames :-) | 20:49 |
| LeoNerd | Oh.. the old shelve could do that | 20:49 |
| jelmer | oh, ok, I wasn't aware of that | 20:50 |
| LarstiQ | vila: cool, should I just give him your email address, or is there a more suitable forum to discuss things? | 20:53 |
| === cprov is now known as cprov-afk | ||
| vila | LarstiQ: here, email, bazaar ML all are fine I think, 100-continue will be welcome in bzr and landing webdav in core is on the agenda, so... | 20:55 |
| LarstiQ | vila: k | 20:56 |
| jelmer | Tak: hi | 20:56 |
| Tak | jelmer: hey, what's up? | 20:58 |
| jelmer | Tak: Looks like I can finally build monodevelop-bzr \o/ | 20:58 |
| Tak | hooray! | 20:58 |
| * Tak brace for critique | 21:02 | |
| jelmer | Tak: I'm not getting it to load yet | 21:05 |
| jelmer | Tak: I've also fixed some things in my branch to get it to build | 21:05 |
| jelmer | Tak: System.InvalidOperationException: Type 'MonoDevelop.VersionControl.Bazaar.BazaarCommands' not found in add-in 'MonoDevelop.VersionControl.Bazaar,1.9.3' | 21:06 |
| vila | BasicOSX: Once my patch land, you may want to edit the NEWS file, I wasn't clear about where to put the fix for #355273 | 21:07 |
| BasicOSX | ok | 21:07 |
| BasicOSX | PQM still eating on it | 21:07 |
| Tak | jelmer: that's defined in BazaarCommands.cs - is there maybe an old assembly floating around? | 21:08 |
| vila | BasicOSX: Eerk, just saw that, I thought your 'Approved' meant: 'Go, sent it to pqm' :-/ | 21:11 |
| BasicOSX | he | 21:12 |
| BasicOSX | heh | 21:12 |
| BasicOSX | Your mailing list said if you would like to merge yourself | 21:12 |
| vila | BasicOSX: So, you're still using lp:~tanner/bzr/1.14rc1, you can use http://bazaar.launchpad.net/~tanner/bzr/1.14rc1 | 21:13 |
| vila | BasicOSX: *I* had problems with lp urls making PQM hang, but that's me :) | 21:13 |
| vila | BasicOSX: yeah, sure, no problem | 21:14 |
| vila | I'm off, have a nice day all | 21:15 |
| vila | BasicOSX: by the way, I worked a bit on bug #355454, AFAICS, the warning is still harmless, we should avoid it, but the strings *are* different when the warning fired (one path is file, the other is its base dir), so don't worry too much about it) | 21:17 |
| ubottu | Error: Could not parse data returned by Launchpad: The read operation timed out (https://launchpad.net/bugs/355454/+text) | 21:17 |
| vila | if even ubottu times out now :) | 21:18 |
| pygi | who's gonna gimme a quick line to migrate git repo to bzr? :) | 21:18 |
| pygi | (and yes, I know about fast-import) | 21:18 |
| jelmer | Tak: no, that doesn't seem to help | 21:19 |
| jelmer | pygi: bzr git-import ? | 21:19 |
| pygi | jelmer, o, such a command exists? xD | 21:19 |
| jelmer | pygi: if you have bzr-git installed | 21:19 |
| pygi | jelmer, yes, I do | 21:20 |
| pygi | jelmer, I tried doing "bzr branch git://path" but it didn't work :p | 21:20 |
| jelmer | pygi: oh, that should work | 21:20 |
| pygi | jelmer, hm, this command seems to have same problem...compressing objects stops at random percentage | 21:21 |
| jelmer | pygi: please file a ug | 21:21 |
| jelmer | *bug | 21:21 |
| pygi | jelmer, bzr: ERROR: mmap.error: [Errno 22] Invalid argument | 21:22 |
| pygi | oh well | 21:22 |
| pygi | will do | 21:22 |
| jelmer | pygi: ah, you're running python2.6 ? | 21:22 |
| pygi | jelmer, yes? | 21:22 |
| jelmer | pygi: there's a bug in the way bzr-git uses the offset argument to mmap apparently | 21:23 |
| jelmer | and that parameter is only available in py2.6 | 21:23 |
| pygi | jelmer, right, so I should just try calling bzr with py2.5? | 21:23 |
| jelmer | Tak: perhaps I'm installing the plugin differently; I'm building a repository and installing from that | 21:23 |
| jelmer | Tak: is there an easier way? | 21:23 |
| Tak | I'm building the plugin, then manually dropping the dll into my addins directory | 21:24 |
| Tak | I guess if it doesn't work to create a repo and install that way, it needs to be addressed, though | 21:24 |
| pygi | jelmer, want a patch for sha deprecation warning? | 21:29 |
| === Toksyury1l is now known as Toksyuryel | ||
| jelmer | pygi: where is that occurring? | 21:31 |
| pygi | jelmer, dulwich if I remember right | 21:32 |
| BasicOSX | pygi: sure that isn't a pycrypto issue? | 21:32 |
| pygi | BasicOSX, well, it tells me that sha is deprecated, to use hashlib instead :p | 21:33 |
| jelmer | pygi: Are you using the latest dulwich, I thought we had fixed all those issues.. | 21:34 |
| jelmer | Tak: woot, I got it working now | 21:35 |
| pygi | jelmer, latest from bzr | 21:35 |
| Tak | woo! | 21:35 |
| BasicOSX | vila: just point of interest, if my pqm of your patch played ok, won't your pqm just fall out with nothing to do? I still see your patch playing. | 21:37 |
| jelmer | pygi: in that case, please submit | 21:37 |
| pygi | jelmer, will do, I'll try to fetch/install once again | 21:39 |
| lifeless | BasicOSX: it will find a merge to do | 22:10 |
| jelmer | lifeless: pong | 22:16 |
| lifeless | hi | 22:19 |
| jelmer | lifeless: you pinged me yesterday? | 22:21 |
| lifeless | *gone* | 22:26 |
| lifeless | [as in the reason is gone] | 22:30 |
| jelmer | lifeless: ah, ok | 22:32 |
| * jelmer wonders how much review plugging he can do before it becomes annoying | 22:33 | |
| lifeless | jelmer: for your serialiser? | 22:43 |
| jelmer | lifeless: InterBranch.pull in particular, as that will be very noticable to bzr-svn users | 22:52 |
| jelmer | lifeless: I'd already given up on RIOSerializer making it into the new format - am I mistaken? | 22:53 |
| lifeless | yes, it can't get in 1.14, it can in 1.15 | 22:55 |
| lifeless | beta format != no more changes | 22:55 |
| jelmer | lifeless: ok, so I guess that means I have at least another week or to to whine about reviews for that :-) | 23:16 |
| james_w | hmm, I seem to have a case of bzr pushing a full branch to launchpad again | 23:47 |
| james_w | Using saved push location: bzr+ssh://james-w@bazaar.launchpad.net/~james-w/bzr/bzr.dev.hooks | 23:48 |
| james_w | Source format does not support stacking, using format: 'Remote BZR Branch' | 23:48 |
| james_w | bzr remote repository | 23:48 |
| james_w | Using default stacking branch /~bzr/bzr/trunk at bzr+ssh://james-w@bazaar.launchpad.net/%7Ejames-w/bzr/ | 23:48 |
| james_w | then lots of data being sent | 23:48 |
| lifeless | james_w: bzr version? | 23:51 |
| james_w | revision: 4230 | 23:51 |
| james_w | hmm, that's a bit old | 23:51 |
| jelmer | lifeless: what is record_entry_contents() used for these days? | 23:52 |
| lifeless | jelmer: commit | 23:52 |
| jelmer | lifeless: as opposed to record_iter_changes, I mean? | 23:53 |
| lifeless | jelmer: we use record_iter_changes when it will be faster | 23:53 |
| jelmer | is there any way I can force either to be used? | 23:54 |
| lifeless | not currently, why? | 23:54 |
| james_w | still get the same message with the tip of bzr.dev | 23:54 |
| lifeless | james_w: rev 4174 fixed it in theory, if the /~bzr/bzr/trunk is stackable on lp | 23:55 |
| grettke | Hi folks, I've got a question about doing a bzr push to a svn project that does not yet exist. I'm doing a bzr push --create-prefix [url.../trunk] but bzr complains: ERROR: Prefix missing for branches/merged; please create it before pushing. Both branches and tags projects exist. I am confused; what is wrong here? | 23:55 |
| james_w | it should be, if it isn't we should certainly fix that | 23:56 |
| jelmer | grettke: which version of bzr-svn? | 23:56 |
| lifeless | james_w: it is | 23:56 |
| jelmer | lifeless: I don't have record_iter_changes implemented for bzr-svn yet | 23:56 |
| lifeless | james_w: so, check your ~/.bzr.log | 23:57 |
| james_w | nothing interesting | 23:57 |
| jelmer | grettke: if it's not bzr-svn trunk then you need to use "bzr svn-push" rather than "bzr push" | 23:58 |
| lifeless | james_w: if you can reproduce this, get a trace using -Dhpss and file a bug | 23:58 |
| james_w | [14773] 2009-04-06 23:52:29.421 INFO: Source format does not support stacking, using format: 'Remote BZR Branch' | 23:58 |
| james_w | bzr remote repository | 23:58 |
| james_w | [14773] 2009-04-06 23:52:29.427 INFO: Using default stacking branch /~bzr/bzr/trunk at bzr+ssh://james-w@bazaar.launchpad.net/%7Ejames-w/bzr/ | 23:58 |
| james_w | 11.267 Using fetch logic to copy between KnitPackRepository('file:///home/jw2328/devel/bzr/.bzr/repository/')(<RepositoryFormatKnitPack6>) and RemoteRepository(bzr+ssh://james-w@bazaar.launchpad.net/%7Ejames-w/bzr/bzr.dev.known_hooks/.bzr/)(<RemoteRepositoryFormat>) | 23:58 |
| grettke | jelmer: I am using bzr 1.12 (standard install). Where do I check which bzr svn is it? | 23:58 |
| grettke | jelmer: I see. It is definitely not trunk. | 23:58 |
| jelmer | grettke: in that case you can't have the latest bzr-svn, so you'll need to use "bzr svn-push" | 23:58 |
| jelmer | grettke: as of bzr 1.14 "bzr push" will Do The Right Thing | 23:58 |
| grettke | jelmer: I see. Thanks | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!