| ronny | i want it to be distributed with the commit its refering to | 00:00 |
|---|---|---|
| Spaz | strange question... | 00:00 |
| Spaz | what is ubottu written in? | 00:00 |
| Spaz | and is it open source? | 00:00 |
| Spaz | oh it's a supybot :( | 00:00 |
| * Spaz cries a bit, and forks back into the background | 00:00 | |
| ronny | monotone can do that just fine | 00:00 |
| lifeless | ronny: AIUI monotone it will do that because it syncs the entire database bidirectionally unconditionally | 00:01 |
| ronny | lifeless: its append-only - and metadata are certified key-value pairs on the revision | 00:02 |
| lifeless | ronny: I'm sorry, but we don't have an existing facility. What is the monotone facility called so I can look it up | 00:02 |
| ronny | (and it can have more than one key-value pair with the same key) | 00:02 |
| Odd_Bloke | ronny: What would happen when the same revision was richly-tagged in two different branches at the same time? | 00:02 |
| ronny | lifeless: certificates | 00:02 |
| lifeless | Odd_Bloke: monotone's storage system is quite sophisticated, you get two tags with different certs | 00:03 |
| lifeless | ronny: thanks | 00:03 |
| ronny | Odd_Bloke: thats the way fast-forward merges with branches work in monotone | 00:03 |
| ronny | i rev, n branches | 00:03 |
| lifeless | ronny: http://www.monotone.ca/docs/Certificates.html <- the right place? | 00:03 |
| ronny | just n certificates with the key branch, and the branch names as value | 00:03 |
| ronny | lifeless: yeah | 00:04 |
| lifeless | ronny: right, I've been through some related stuff before | 00:04 |
| ronny | lifeless: it allos to do quite cool things | 00:04 |
| lifeless | ronny: I'll read this on the train after work; I wish I could offer you a precanned answer, but we don't have one | 00:05 |
| ronny | like accept only revs that have passes a set of tests on all buildbots | 00:05 |
| lifeless | AFAIK neither hg nor git have precanned answers for adding-metadata like this either | 00:05 |
| ronny | lifeless: basically all mainstream dvc's have toy-level metadata | 00:05 |
| lifeless | I think its a perspective thing | 00:06 |
| lifeless | monotone has a very different worldview | 00:06 |
| lifeless | like darcs has a different worldview | 00:06 |
| lifeless | and its good to learn and consider ideas; however the challenge for bzr/git/hg in this space is that much of monotone is built up from the certificates primitive, and well, we're not. | 00:07 |
| ronny | lifeless: well, the core of it is the graph of files/revisions (i dont correctly understand it, but bzr's graph should be pretty close) | 00:13 |
| ronny | however everything thats not part of the real history of files is not in that graph, but a certificate that add information (commit messages, authors, dates, ...) | 00:14 |
| fullermd | Which is to say, a rather different worldview 8-} | 00:20 |
| ronny | but much more sane and practical | 00:22 |
| fullermd | A matter of perspective. Some people consider CVS more sane and practical too. | 00:22 |
| ronny | one can just limit updates by the certificates added to an revision | 00:22 |
| ronny | (ie test passes, developer approval, anything else) | 00:23 |
| fullermd | Yes, but by its very nature that means that the metadata is completely divorced from the data. Two people could have the same revision, but have completely different ideas about how committed it, when it was committed, and what the log message was. | 00:24 |
| fullermd | So you end up having to have conflict resolution procedures for that, and accepting the local-view issues. | 00:25 |
| ronny | you just dont have to care about that | 00:25 |
| fullermd | Neither is necessarily Right, but there are different tradeoffs either way. | 00:25 |
| fullermd | I'll care about whatever I wanna care about, thankyouverymuch ;) | 00:26 |
| ronny | well, its all there, and if you pull it, you keep it | 00:26 |
| spiv | The weather is getting warm enough that I'm starting to really notice it when I run the test suite on my laptop... | 00:45 |
| poolie | spiv, it's supposed to get up to 36C today | 00:46 |
| poolie | also | 00:46 |
| spiv | Yeah, I saw :/ | 00:46 |
| jelmer | lucky bastards | 00:46 |
| poolie | apparently batteries getting hot in a laptop while at full charge is a leading cause of early exhaustion | 00:46 |
| poolie | in the sense of their capacity decreasing | 00:46 |
| spiv | My battery is already down to ~40% capacity, but it is about 2 years old. | 00:47 |
| poolie | so if you want to be really frugal it's better to pull them out while on ac | 00:47 |
| spiv | Hmm, maybe not quite that bad, but pretty low. | 00:47 |
| poolie | this is pretty annoying if you bump the cord though :) | 00:47 |
| spiv | Right, which I do do :) | 00:47 |
| poolie | apparently it is best to store them at about 50% charge | 00:48 |
| poolie | which is a bit hard to arrang | 00:48 |
| lifeless | yah | 00:54 |
| lifeless | there is a site | 00:54 |
| lifeless | that has differnet battery types and storage levels | 00:54 |
| === sdboyer is now known as sdboyer|blaaah | ||
| AfC | It's probably best, though, to arrange for you laptop not to oops at 100% CPU when you think it's suspended before putting it in a bag and closing the zipper. There's just nothing like the smell of singed components that comes from baking your machine in constrained CPU exhaust. | 01:04 |
| fullermd | Oh, sure there is. Like the one time I put 120 volts across a 2N2222... | 01:07 |
| lifeless | thats a DC diode isn't it ? | 01:08 |
| lifeless | a little one | 01:08 |
| fullermd | NPN bipolar transistor. | 01:08 |
| lifeless | duh, yes | 01:08 |
| lifeless | I need to do more electronics I think | 01:08 |
| fullermd | It lasted a good quarter of a second, I figure... | 01:09 |
| AfC | What's a few extra volts between friends? | 01:12 |
| lifeless | AfC: electric | 01:12 |
| fullermd | Well, a few extra volts presumably means a lot of extra amps :p | 01:12 |
| fullermd | After all, a transistor is just a fuse with gain... | 01:14 |
| poolie | spiv, i thought i remembered multiple occurrences of _ on the lhs of an assignment giving an error in python | 01:16 |
| poolie | but it does seem to work, at least in 2.5 | 01:16 |
| lifeless | poolie: don't see why it would error, it just has to bind multiple times :) | 01:17 |
| === jamesh_ is now known as jamesh | ||
| lifeless | poolie: I think for _, _ in thing: | 01:19 |
| lifeless | poolie: that might error | 01:19 |
| poolie | it's not a big deal | 01:20 |
| spiv | poolie: I dimly recall there being some case where than happens, but I can't seem to find it now. | 01:21 |
| spiv | So I guess it's sufficiently obscure not to matter :) | 01:21 |
| spiv | poolie: ok, I think I have only one more thing to do on the autopack branch | 01:47 |
| spiv | poolie: which is deciding what the "NotPackRepository" error on the wire ought to look like | 01:48 |
| lifeless | spiv: why error? | 01:48 |
| lifeless | spiv: if there is no return value, and its not a pack repo, just swallow | 01:48 |
| spiv | lifeless: well, that's a possibility. | 01:49 |
| spiv | It is an indication that at best something weird is happening. | 01:49 |
| spiv | Because it shouldn't ever be trying that verb on a non-pack repo. | 01:49 |
| spiv | Not returning an error has the advantage of being a little bit simpler. | 01:50 |
| spiv | Ok, I think I'll just not return an error, I'm happy with that. | 01:51 |
| spiv | lifeless: thanks | 01:51 |
| poolie | that's ok with me too | 02:11 |
| spiv | Ok, I've just sent the current patch to the list. | 02:12 |
| spiv | I think this version is ready for merging as-is, so please take a look and give it a BB: blessing :) | 02:12 |
| poolie | i will | 02:37 |
| poolie | spiv, you have a handful of other patches approved for 1.9 | 02:38 |
| poolie | if you're sure of them now would be a good time, while i read this | 02:38 |
| poolie | lifeless: so would there be any drawbacks to making 1.9 (the btree format) be rich-root only? | 02:41 |
| poolie | i guess conversions into it would be substantially slower as we'd have to rewrite all inventories | 02:42 |
| lifeless | poolie: do the sha1's get rewritten correctly? | 02:43 |
| lifeless | I still don't have a clear answer to this | 02:43 |
| poolie | when the inventories are changed when fetching into a rich root repo? | 02:43 |
| lifeless | and yes, while the default isn't rich root, I think there are clear drawbacks to adding a new format that is a trapdoor for users on the default | 02:43 |
| lifeless | yes | 02:43 |
| lifeless | and during reconcile | 02:43 |
| lifeless | I don't know the status of this; I thought it was the one remaining issue; I may be wrong and its done. | 02:44 |
| poolie | what would reconcile be doing here? | 02:44 |
| poolie | s/here/relevant to this | 02:45 |
| lifeless | there are existing repositories with damaged goods | 02:45 |
| lifeless | where the revision sha1 is the sha1 of a non-rich-root inventory, but the inventory is a rich root one | 02:45 |
| lifeless | I have a patch I cannot land for 'check' to check the sha1's are valid | 02:45 |
| lifeless | reconcile can in theory detect this specific issue by converting the repository to a non-rich-root one, serialising, and if the sha then matches, rewrite the revision object to have the current inventories sha | 02:46 |
| poolie | cannot land the patch why? because there's no reconcile code to fix up what it finds? | 02:47 |
| lifeless | yeah | 02:47 |
| lifeless | in fact, IMO accessing inventories should check the sha1 against the revision as a matter of course | 02:47 |
| lifeless | but thats different (though still dependent) | 02:47 |
| Peng_ | beuno: ping? | 03:09 |
| poolie | spiv, review sent | 03:15 |
| spiv | poolie: thanks | 03:16 |
| spiv | poolie: I don't see the review anywhere? | 03:21 |
| poolie | :/ | 03:21 |
| poolie | try now? | 03:22 |
| spiv | poolie: I see it now | 03:24 |
| spiv | I just tested 'bzr pack' manually, and it's working ok over HPSS. | 03:25 |
| spiv | And that explicit raise is correct (although it maybe it'd be worth making a self._ensure_ok(response) helper like RemoteTransport uses?). | 03:27 |
| poolie | ok | 03:27 |
| poolie | please send it to pqm then | 03:27 |
| poolie | it does seem kind of buggy to me that so many of the client stubs check the response explicitly | 03:27 |
| poolie | (i may be out of date here, i know you landed something for this) | 03:27 |
| spiv | _translate_error handles responses that are flagged as errors, this is checking that a successful response doesn't have garbage (which is perhaps less useful now that error responses are clearly flagged on the wire). | 03:27 |
| poolie | ah i see | 03:27 |
| spiv | It's more interesting when the response may be one of a fixed set of values. | 03:28 |
| spiv | I think maybe that the client should be more liberal and not worry about the content of responses that it doesn't use in any way. | 03:29 |
| spiv | But atm we're pretty consistent about doing it this way. | 03:29 |
| spiv | Ok, it's with PQM. | 03:31 |
| spiv | I'm going to grab a late lunch. | 03:31 |
| michalski-bj | when trying to push my branch(that I own)(bzr push lp:~<username>/+junk/<project>) | 03:49 |
| michalski-bj | it says: bzr: ERROR: Cannot lock LockDir(http://bazaar.launchpad.net/%7Emichalski/%2Bjunk/vector-core/.bzr/branch/lock): Transport operation not possible: http does not support mkdir() | 03:49 |
| michalski-bj | ... | 03:49 |
| Peng_ | michalski-bj: Run 'bzr lp-login your-username' | 03:50 |
| michalski-bj | ok thanks, I think I remember doing this on my old pc, you should add these instructions to the error message | 03:51 |
| lifeless | poolie: back | 03:59 |
| michalski-bj | thanks again, gotta go, bye | 03:59 |
| Peng_ | Has that error message improved in a recent version? | 04:12 |
| warren | [warren@newcaprica ldm-trunk]$ bzr diff | 04:15 |
| warren | bzr: ERROR: [Errno 12] Cannot allocate memory | 04:15 |
| warren | [warren@newcaprica ldm-trunk]$ bzr diff | 04:15 |
| warren | === modified file 'src/ldm.c' | 04:15 |
| warren | Really odd... | 04:15 |
| warren | bzr-1.7-1.fc9.x86_64 | 04:15 |
| Peng_ | "Errno 12", huh? I wonder why that happens instead of a MemoryError? | 04:18 |
| lifeless | Peng_: probably a C extension | 04:19 |
| lifeless | Peng_: raising OSError(errno, strerror(errno)) | 04:19 |
| Peng_ | Oh, ok | 04:19 |
| lifeless | warren: ^ | 04:19 |
| warren | meaning? | 04:19 |
| lifeless | warren: not sure about root cause; does this happen repeatedly for you? | 04:20 |
| warren | lifeless: yes | 04:20 |
| warren | lifeless: although not all the time | 04:20 |
| lifeless | warren: there should be a backtrace in ~/.bzr.log | 04:21 |
| warren | lifeless: http://fpaste.org/paste/8358 | 04:23 |
| lifeless | hmm, I don't have a browser handy | 04:24 |
| lifeless | warren: could you file a bug please? | 04:24 |
| warren | umm, where, how? | 04:24 |
| lifeless | https://bugs.launchpad.net/bzr/ | 04:24 |
| fullermd | _readdir_pyx | 04:24 |
| spiv | Yay, autopack-rpc landed. | 04:25 |
| lifeless | fullermd: interesting; readdir is ENOMEMing? - or - | 04:25 |
| lifeless | warren: actually | 04:25 |
| lifeless | warren: I bet that this is a fixed bug in 1.8 | 04:25 |
| lifeless | warren: readdir has some special needs for errno handling | 04:25 |
| warren | ok | 04:25 |
| lifeless | we didn't have that correct in the first release of the readdir bindings | 04:25 |
| fullermd | Seems like it. That's what errno 12 is on my system (though I'm pretty sure those vary a fair bit from system to system) | 04:27 |
| lifeless | they're pretty stable for the common ones | 04:27 |
| poolie_ | lifeless: i'd like you to make a 1.9 branch when my current pqm job completes | 04:40 |
| poolie_ | approximately then anyhow | 04:41 |
| poolie_ | if it would be much easier you can do it now | 04:41 |
| lifeless | poolie_: tell me when its ready, I've made the branch, just need pull over the top | 04:41 |
| poolie_ | kk | 04:41 |
| lifeless | poolie_: I'm leaving for the train in < 10 minutes though | 04:41 |
| lifeless | ok -> train (the 4:03 gets to town hall with at 15 to, allowing a timely walk with no crowds) | 04:47 |
| spiv | I'm looking at a similar trip, different train line :) | 04:48 |
| === sdboyer|blaaah is now known as sdboyer | ||
| === spm_ is now known as spm | ||
| vila | hi all ! | 07:04 |
| * gour sent reply to 'bzr vs. git' thread | 07:33 | |
| luks | hopefull it will not turn into a | 07:34 |
| luks | ... into a 'bzr vs git' thread | 07:34 |
| luks | man, I can't type | 07:34 |
| poolie_ | i hope so too | 07:35 |
| poolie_ | i'll kill the thread if it does | 07:35 |
| poolie_ | life's too short | 07:35 |
| newfeats | hi. i'm trying to set the BZR_SSH variable. how would i go about that? | 07:51 |
| poolie_ | on windows or unix? | 07:52 |
| newfeats | win. | 07:52 |
| newfeats | i created my SSH keys already and IDed myself. it suddenly then asks for BZR_SSH variable. | 07:53 |
| newfeats | i'm using putty from openssh.org's site links. | 07:55 |
| newfeats | getting tired of conservatives. | 07:57 |
| beuno | 08:17 | |
| poolie_ | newfeats: (back) what message are you getting exactly? | 08:18 |
| poolie_ | could you open something at http://answers.launchpad.net/bzr | 08:18 |
| === poolie_ changed the topic of #bzr to: Bazaar version control system | http://bazaar-vcs.org | please test 1.9rc1 and format 1.9 | http://irclogs.ubuntu.com/ | http://planet.bazaar-vcs.org/ | ||
| newfeats | poolie_: https://answers.launchpad.net/bzr/+question/49587 | 08:33 |
| luks | newfeats: it's missing the main information, the actual error message | 08:34 |
| poolie_ | ok, i took a stab at it | 08:37 |
| poolie_ | good night though | 08:37 |
| Spaz | hello :0 | 08:38 |
| Spaz | :) | 08:38 |
| Spaz | happy halloween | 08:38 |
| === vila is now known as vila-dentist | ||
| uws | Urgh | 09:56 |
| uws | Bzr is eating all my RAM | 09:56 |
| uws | PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND | 09:57 |
| uws | 14032 wbolster 20 0 2492m 1.4g 1536 D 13 73.5 5:54.59 bzr | 09:57 |
| uws | 2GB RAM in total | 09:57 |
| Peng_ | That's awesome. What the heck are you doing with it? | 09:57 |
| Peng_ | (Sorry, not helpful.) | 09:57 |
| uws | just branching a repo | 09:57 |
| uws | try for yourself: bzr branch lp:~uws/webkit-open-source/webkit.trunk WebKit | 09:57 |
| uws | bzr 1.8 btw | 09:58 |
| uws | PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND | 09:58 |
| Peng_ | No thanks. I've already got Firefox using all my RAM. | 09:58 |
| uws | 14032 wbolster 20 0 2502m 1.6g 1520 R 100 79.8 6:22.60 bzr | 09:58 |
| uws | Also eating all 100% of my CPU | 09:58 |
| uws | well, one of my cores | 09:59 |
| Peng_ | Oh, that's your branch? | 10:01 |
| Peng_ | Jeepers, how large is it to cause that? | 10:01 |
| uws | Peng_: it's huge | 10:01 |
| uws | it's (not even up to date) mirror of the webkit svn repository | 10:02 |
| uws | Finishing pack 5/5 | 10:02 |
| uws | Yay. RAM usage dropped | 10:02 |
| Peng_ | What does "bzr info -v" do? Download the entire indexes? | 10:02 |
| uws | Peng_: on my branch? | 10:04 |
| uws | bzr is now eating 100% CPU in "Build phase 0/2" | 10:04 |
| uws | whatever that may be | 10:04 |
| uws | ai, RAM usage growing again :( | 10:06 |
| * uws waits for the OOM to kick in ;) | 10:06 | |
| === vila-dentist is now known as vila | ||
| Peng_ | uws: No, in general. I ran "bzr info -v" on your branch, and it was using a lot of bandwidth and the RAM kept growing (only to like 90 MB, but..). | 10:10 |
| uws | What does "build phase" mean? | 10:10 |
| Peng_ | Oh..I guess I can check the code. :P | 10:10 |
| vila | uws: building the working tree | 10:11 |
| uws | takes 100% cpu for minutes already | 10:11 |
| uws | and this is a relatively fast machine | 10:11 |
| Peng_ | Hmm...hasn't that been improved recently? | 10:12 |
| uws | 1.8 is quite recent | 10:13 |
| uws | the progress bar is halfway done and just advanced to "build phase 1/2" | 10:13 |
| Peng_ | * ``bzr co`` uses less memory. It used to unpack the entire WT into | 10:13 |
| Peng_ | memory before writing it to disk. This was a little bit faster, but | 10:13 |
| Peng_ | consumed lots of memory. (John Arbash Meinel, #269456) | 10:13 |
| Peng_ | That's more recent than 1.8. | 10:13 |
| uws | Hm, good | 10:14 |
| uws | Branched 29843 revision(s). | 10:14 |
| uws | YAY! | 10:14 |
| Peng_ | Yay | 10:14 |
| jrydberg_ | hi. | 10:19 |
| visik7 | it's been a while since I used bzr upload I don't remember how to put it through ssh I got bzr: ERROR: Unsupported protocol for url "sftp://... | 10:22 |
| visik7 | or ssh:// | 10:23 |
| uws | vila: Install python-paramiko | 10:23 |
| uws | vila: then sftp:// ("dumb") and bzr+ssh:// ("smart") should work | 10:23 |
| visik7 | oh | 10:33 |
| visik7 | and for permission there is no way to have a post command that fixes them? | 10:33 |
| Pieter | is ian here? | 11:38 |
| james_w | Pieter: Ian Clatworthy? | 11:43 |
| Pieter | yes | 11:43 |
| james_w | it's the middle of the night for him | 11:43 |
| Pieter | ah :) | 11:43 |
| spiv | aadassdfsd | 12:08 |
| Odd_Bloke | spiv: aadassdfsd to you too. | 12:09 |
| spiv | Odd_Bloke: I would also have accepted "gesundheit" | 12:12 |
| james_w | if I have a 16000 path tree, is it going to be more efficient for bzr workingtree operations to have it split in to directories? | 12:13 |
| james_w | it's just a flat layout currently | 12:13 |
| awilkins | james_w: I can't see why it would be any different, personally | 12:29 |
| james_w | it seemed to be taking an age to read the dirstate | 12:31 |
| james_w | it's not so bad now though, once it's reasonably up-to-date | 12:31 |
| awilkins | This on Windows? | 12:31 |
| james_w | nah | 12:32 |
| awilkins | I get the same ; once it's "warm" my tree of 4000 odd paths will `bzr st` in less than a second | 12:32 |
| awilkins | On *nix it's rather faster though :-) | 12:32 |
| james_w | this is a rather odd tree | 12:33 |
| awilkins | 16,000 files in one folder, yes, that's a little off | 12:33 |
| awilkins | *odd | 12:33 |
| james_w | it's not source code or anything | 12:33 |
| james_w | just a bunch of log files | 12:34 |
| awilkins | Heh, I can imagine | 12:34 |
| awilkins | Why, pray tell, do you version logfiles? | 12:34 |
| awilkins | Would it not be just as good to incrementally back them up? | 12:34 |
| james_w | it was Rob's suggestion, though I think I'm implementing it wrong | 12:34 |
| awilkins | Since a logfile, in my experience, is not mutable once it's finished? | 12:35 |
| james_w | I think it's supposed to clear the tree after committing | 12:35 |
| awilkins | Meh? | 12:35 |
| james_w | so it's instead of logrotate | 12:35 |
| james_w | I'm using it as a kind of logwatch | 12:35 |
| awilkins | What, sort of "bzr commit -m "Lots of logs" ; rm * ? | 12:36 |
| james_w | hmm, can't find where Rob uses it to compare | 12:39 |
| james_w | it's on bzr-playground.gnome.org somewhere, but I think it's hidden | 12:40 |
| awilkins | james_w: Oh, is it supposed to be renaming each rotated log to the same filename? | 12:51 |
| james_w | yeah, I think that's what Rob does | 12:51 |
| awilkins | james_w: that way you can compare the logs to each other based on their diff (and presumably spot anomalies easier)( | 12:51 |
| awilkins | Works ok as long as your diff viewer supports rules to ignore timestamps I suppose.(or if you set your log formats to omit them) | 12:52 |
| james_w | though his is in in-process, so it just writes the log, commits, and then removes it. I can't really do that, as I have four processes | 12:52 |
| awilkins | james_w: How about - write log until finished, rename log to a file that ISNT in your ignore pattern | 12:52 |
| awilkins | Have job that watches for new non-ignored files | 12:53 |
| james_w | yeah, that could work | 12:55 |
| awilkins | I've been using it to diff my output from a program so I know if I break it (in the absence of proper unit tests /me slaps own wrist) | 12:57 |
| james_w | :-) | 12:57 |
| awilkins | It spits about 9000 files so it's v. useful on that score | 12:57 |
| Odd_Bloke | What are split-inventories? | 13:27 |
| rocky | don't suppose anyone's updating http://doc.bazaar-vcs.org/bzr.dev/en/release-notes/NEWS.html for the 1.9rc1 release? | 13:46 |
| Tak | is there a known winstaller for a bzr-svn that works with a newer bzr than 1.5? | 14:03 |
| jelmer | Tak: Hi | 14:15 |
| jelmer | Tak: I think John was looking at creating one for 1.8 last night | 14:15 |
| jelmer | not sure what the status of that is | 14:15 |
| jelmer | jam: ping | 14:15 |
| === Spaz is now known as Black_Kittens | ||
| Tak | jelmer: hello, cool | 14:18 |
| jelmer | Tak, btw, did you see my changes to monodevelop-bzr? | 14:19 |
| Tak | yeah, I'm just merging them into my branch now | 14:19 |
| Tak | I was just going to ask how things were going wrt md-bzr | 14:20 |
| jelmer | I'm still waiting for a new version of monodevelop to hit debian sid :-/ | 14:21 |
| Tak | heh | 14:22 |
| Tak | that won't happen until after mono 2.0 hits | 14:22 |
| Tak | "bzr: ERROR: Repository KnitPackRepository is not compatible with repository KnitPackRepository" | 14:26 |
| Peng_ | Tak: One repo is --pack-0.92, one is --rich-root-pack. | 14:27 |
| Odd_Bloke | Tak: And the error message has been improved, I believe. :) | 14:28 |
| * Tak waiting for new bzr to hit debian sid :-P | 14:28 | |
| Peng_ | Oh, really? That's good. | 14:28 |
| === thekorn_ is now known as thekorn | ||
| jelmer | tak: there's new versions in experimental | 14:38 |
| Tak | hm @ experimental | 14:51 |
| Tak | argh, now my wc is rich-root-pack and my lp branch is an old format - how do I resolve this? | 14:56 |
| Peng_ | Tak: Well, you could upgrade the lp branch, or you could push your current branch to a non-rich-root repo to downgrade it (probably). | 14:58 |
| Peng_ | Err, wait. | 14:58 |
| Peng_ | Or pull it into a non-rich-root repo. | 14:59 |
| Tak | I tried to upgrade the lp branch | 14:59 |
| Peng_ | I dunno. *Something* like that should work, if someone didn't go and break it. | 14:59 |
| Tak | some of the other branches are rrp, so it's going to be a pita if I can't convert mine somehow | 14:59 |
| Peng_ | Tak: What happened? | 14:59 |
| Peng_ | Tak: You might have to use the full bazaar.launchpad.net URL, and you might have to use sftp | 14:59 |
| Peng_ | (Yes, this is a pain.) | 15:00 |
| Tak | hmm, I tried the bzr+ssh url | 15:00 |
| Tak | I'll try others | 15:00 |
| Tak | ok, it looks like it's going with sftp | 15:04 |
| Tak | success! | 15:08 |
| Peng_ | Great. :) | 15:12 |
| awilkins | Yes, the SFTP works, I don't think the smart server does upgrades | 15:13 |
| Peng_ | I thought that had been added recently (1.6?), just thunking over to the VFS. But that might've been something else. | 15:14 |
| awilkins | Hmm, which version is Launchpad running though | 15:14 |
| tvainika | jelmer: do you have plans to upload bzr 1.9rc1 to debian experimental? | 15:15 |
| jelmer | tvainika, Yeah - I just wasn't aware it was out already :-) | 15:15 |
| Peng_ | awilkins: 1.7.1rc1 | 15:16 |
| Peng_ | upgrade over bzr+ssh was added in 1.6rc2. | 15:17 |
| Peng_ | But I think there are issues with LP. | 15:17 |
| james_w | what's the "--strict" argument to testament for? | 15:19 |
| awilkins | james_w: It seems to produce a different hash | 15:21 |
| awilkins | james_w: Why this is, I'm not sure | 15:21 |
| james_w | yeah, that's what concerns me | 15:22 |
| awilkins | Theory - the strict has includes the log comment | 15:22 |
| awilkins | git hashes include their log comments, perhaps bzr does not by deafult | 15:22 |
| james_w | it adds in ie.revision and ie.executable to what is hashed for each ie | 15:23 |
| chrisob | When I get a 'bzr: ERROR: Connection closed: please check connectivity and permissions (and try -Dhpss if further diagnosis is required)' What should I check? I know there is connectivity and the user has permission (tested from another PC) | 15:25 |
| awilkins | chrisob: What's the server? | 15:26 |
| chrisob | an internal linux server, I dont know if thats what you mean though. I have only just started supporting users on it... | 15:27 |
| awilkins | Hmm, which protocol are you using | 15:28 |
| chrisob | SSH | 15:28 |
| awilkins | Ok, can this machine just open a plain old shell using SSH for that user? | 15:29 |
| chrisob | bzr info bzr+ssh://<username>@<server> | 15:29 |
| awilkins | Ah, how about - is this machine running ssh-agent with the appropriate key loaded | 15:29 |
| chrisob | well it has no problem with another shell connection using ssh | 15:30 |
| chrisob | i though it could be a key problem | 15:30 |
| === sdboyer is now known as sdboyer|class | ||
| chrisob | though i dont know where it references the key | 15:31 |
| awilkins | ls | 15:31 |
| awilkins | oops | 15:31 |
| awilkins | chrisob: It should just choose try all the keys in the local ssh-agent against the server and see if they work for the user you are specifying | 15:36 |
| chrisob | okay thought so....thanks for the help | 15:38 |
| mwhudson | jelmer: bzr.dev get svn://svn.twistedmatrix.com/svn/Twisted/trunk twisted-bzr-svn | 16:16 |
| mwhudson | bzr: ERROR: The branch svn://svn.twistedmatrix.com/svn/Twisted/trunk has no revision None. | 16:16 |
| mwhudson | jelmer: ^ seen that one before? | 16:16 |
| jelmer | mwhudson, yeah | 16:16 |
| jelmer | mwhudson, what version of bzr-svn? | 16:16 |
| mwhudson | jelmer: lp:~jelmer/bzr-svn/0.4/ as of a day or two ago | 16:17 |
| jelmer | hmm | 16:17 |
| mwhudson | jelmer: i'm updating now, will try again | 16:17 |
| jelmer | mwhudson, please file a bug | 16:17 |
| jelmer | mwhudson, I did fix some things related to this, but more than a month ago | 16:24 |
| jelmer | it's actually another exception masked by an exception handler in bzrlib/builtsin.py | 16:24 |
| === lamont` is now known as lamont | ||
| mwhudson | jelmer: still happens with trunk everything | 17:11 |
| * mwhudson embuginates | 17:11 | |
| mwhudson | jelmer: https://bugs.edge.launchpad.net/bzr-svn/+bug/291686 | 17:19 |
| ubottu | Launchpad bug 291686 in bzr-svn "branching twisted svn fails with "bzr: ERROR: The branch svn://svn.twistedmatrix.com/svn/Twisted/trunk has no revision None."" [Undecided,New] | 17:19 |
| jelmer | mwhudson, thanks | 17:34 |
| jelmer | mwhudson, isn't it like 4 in the morning in NZ btw? | 17:34 |
| mwhudson | jelmer: i'm in london :) | 17:34 |
| jelmer | ahh :-) | 17:34 |
| jam | asmodehn: hey, I just saw your email. The change I made isn't in 1.9 AFAIK | 17:42 |
| === sdboyer|class is now known as sdboyer | ||
| asmodehn_ | jam : yeah that what I realized... I am using your dev versions now to replicate what I have to ;) | 18:08 |
| asmodehn_ | hopefully it ll go to the end this time ;) | 18:09 |
| jam | well, worst case I suppose you could use rsync | 18:14 |
| asmodehn_ | I tried that but I am not sure yet how to properly use it | 18:16 |
| asmodehn_ | but yes for now I ll keep using your dev version ;) | 18:16 |
| asmodehn_ | at least for the big transfers | 18:16 |
| asmodehn_ | 1.9rc1 for the rest I think | 18:16 |
| === mark2 is now known as markh | ||
| === sdboyer is now known as sdboyer|gazpacho | ||
| asmodehn_ | jam : mmm doesnt finish... hit the other bug I posted to the mailnig list :-s | 18:51 |
| jam | asmodehn_: the ldap one? | 18:52 |
| asmodehn_ | yep | 18:54 |
| asmodehn_ | just sent another email with the end of the log | 18:54 |
| asmodehn_ | but yeah maybe I should play with rspush instead :s | 18:56 |
| jam | so... the locking thing seems like a more significant issue that you need to resolve. | 18:57 |
| jam | one quick fix is to just do | 18:57 |
| jam | bzr whoami "My User <my@username>" | 18:57 |
| jam | or whatever makes sense for you | 18:57 |
| jam | it sounds like that would fix it | 18:57 |
| asmodehn_ | the whoami already shows the right user... | 18:57 |
| jam | but is it getting that "by accident" from the system, or because it is set somewhere? | 18:58 |
| asmodehn_ | you mean I need to force it to write it somewhere in bzr ? | 18:58 |
| asmodehn_ | bzr whoami return the current user running the command right ? | 18:58 |
| asmodehn_ | anyway I did that and I ll run the bbranch again... | 18:59 |
| jam | asmodehn_: aren't you also doing something weird with "sudo/su" ? | 19:01 |
| jam | could it be that the other user is not configured correctly? | 19:02 |
| asmodehn_ | bzr whoami is fine everywhere... | 19:02 |
| asmodehn_ | I mean return the good user | 19:02 |
| asmodehn_ | maybe I need to "force it" so it gets stored somewhere in .bzr ? | 19:03 |
| asmodehn_ | everywhere I mean ? | 19:03 |
| === sii` is now known as sii | ||
| ktenney | Howdy, what is the recommended bzrlib version of $>bzr revert -r10 | 19:42 |
| ktenney | I would suspect bzrlib.workingtree.Workingtree.revert, but don't see how to specify a revision to revert to | 19:42 |
| ktenney | there is bzrlib.transform.revert(working_tree, target_tree, filenames, ... but I don't know where to plug in version numbers | 19:51 |
| james_w | ktenney: for the transform thing I suspect you pass a target_tree which is | 20:10 |
| james_w | target_tree = wt.branch.repository.revision_tree(rev_id) | 20:11 |
| james_w | I suggest you look at cmd_revert in bzrlib/builtins.py | 20:11 |
| ktenney | james_w: ok, previously I was discouraged from the builtins.cmd_xxx when scripting, however in this case, preferred to the transform thing? | 20:19 |
| james_w | ktenney: no, I'm just suggesting looking at how bzrlib implements revert might give you some clues about implementing revert | 20:20 |
| ktenney | james_w: ah, ok, thanks. | 20:20 |
| asmodehn_ | jam: mm it looks like explicitely setting teh bzr whoami the problem has been fixed... I ll test once more though... | 20:24 |
| asmodehn_ | jam: mm ok seems it did... bit confusing... in that case, shouldnt whoami return something more when it s not been setup in bazaar, or when the bazaar and the system result dont match ? | 20:38 |
| disturbedsaint | hi all | 21:08 |
| Peng_ | Shouldn't "bzr help formats" list the knit formats as deprecated? | 21:24 |
| Peng_ | So...should using btrees on bzr.dev's repo make much of a difference performance-wise? | 21:30 |
| Peng_ | What about something larger? | 21:30 |
| Peng_ | Are the indices created by "bzr upgrade" fully packed and whatnot? | 21:39 |
| Peng_ | (fully optimized, I mean) | 21:51 |
| fullermd | I would assume they otter be, since it's touching everything anyway. Not that that necessarily bears on whether it does, but... | 21:53 |
| Peng_ | Right. | 21:53 |
| Peng_ | I tried running "bzr pack", but it took 3 seconds and did nothing. | 21:54 |
| Peng_ | I almost want to try to pack it again, but my disk cache has been thrashed enough today. | 22:10 |
| lifeless | beuno: search in loggerhead trunk is broken ? | 22:44 |
| Peng_ | lifeless: Does "bzr upgrade"ing to btrees create them all fully optimized and eveyrthing, or should you run "bzr pack" afterwards? | 22:45 |
| lifeless | Peng_: they should benefit much less from 'bzr pack' | 22:47 |
| Peng_ | Should they benefit at all? | 22:48 |
| lifeless | yes, there is always the latency impact of multiple pack files | 22:49 |
| lifeless | so packed is always optimal vs unpacked | 22:49 |
| lifeless | just the index layer doesn't suck now | 22:49 |
| Peng_ | Well yeah, but... Ignoring multiple pack files, after running "bzr upgrade --1.9", is there any reason to "bzr pack"? Will it save 5 KB of disk space or anything? | 22:52 |
| lifeless | no | 22:54 |
| Peng_ | OK :) | 22:54 |
| Peng_ | Thanks. | 22:54 |
| Peng_ | Nice, upgrading one large repo to btrees made the indices go from 60 to 18 MB. :) | 23:03 |
| disturbedsaint | markh: are you there? | 23:16 |
| markh | disturbedsaint: i am - hi! | 23:16 |
| disturbedsaint | hi | 23:16 |
| disturbedsaint | been trying a little more, clean install and all, but not that much progress unfortunately :/ | 23:17 |
| markh | did you try printing win32event.__file__ just before the failing import of win32pipe? | 23:18 |
| disturbedsaint | didnt get that far :/ | 23:19 |
| disturbedsaint | "FAILED to import tbzrlib - please adjust your PYTHONPATH" | 23:19 |
| disturbedsaint | since I am running from sources and dont want to install it to site-packages (for now, to keep the new install clean ;) but the tbzr dir is in sys.path | 23:20 |
| markh | right - the way I do things is to not try and get 'tbzrlib' in site-packages at all - just set PYTHONPATH to point at the parent of the tbzrlib directory. I do the same with bzrlib itself - PYTHONPATH points at both bzrlib and tbzrlib | 23:21 |
| markh | the *parent* of tbzrlib must be | 23:21 |
| markh | ie, a python shell should be able to do a simple import of tbzrlib | 23:21 |
| disturbedsaint | tried to do it in a clean way with .pth files, but that doesn't really seem to work | 23:22 |
| markh | set set PYTHONPATH=c:\parent_of_tbzrlib | 23:24 |
| markh | s/set set/just set/ | 23:25 |
| lifeless | Peng_: :) | 23:25 |
| markh | (due to some magic, its not necessary for this to be set globally - just when registering the extensions - the path where tbzrlib is written to the com object's registry and used at runtime) | 23:26 |
| pekuja | is it possible to undo a merge if there's a conflict? | 23:28 |
| Peng_ | pekuja: If it's uncommitted, "bzr revert"? | 23:29 |
| pekuja | ah, of course | 23:29 |
| disturbedsaint | markh: the part about it not beeing needed globally is to hard for me to grasp Im afraid :x | 23:30 |
| markh | um - its not necessary to try and set PYTHONPATH to point at tbzr lib in a "global" way. Just at the cmdprompt you are using is fine | 23:30 |
| pekuja | how about a pull? that'd just be a matter of going back to a previous revision, right? | 23:30 |
| Peng_ | pekuja: Well, what do you want to undo? If you want to get rid of the new revisions, "uncommit", though that doesn't touch the working tree. | 23:31 |
| Peng_ | pekuja: You shouldn't pull with uncommitted changes. | 23:31 |
| pekuja | oh, right, you have to commit a pull too? | 23:32 |
| pekuja | sorry, I'm new | 23:32 |
| disturbedsaint | markh: have to reboot, just installed tsvn, brb | 23:33 |
| pekuja | and I meant if I pull something, but maybe that has changes I didn't want to have... well I guess it's kinda not a real issue | 23:33 |
| pekuja | well, maybe if the newly pulled code breaks something without creating a conflict | 23:33 |
| pekuja | how would I "undo" the pull? | 23:33 |
| pekuja | revert? | 23:34 |
| Peng_ | pekuja: Undo how? You could "bzr revert -r 123" to revert the working tree to a previous revision. | 23:34 |
| pekuja | yeah, well I meant going back to how my branch was before I pulled somebody else's changes | 23:35 |
| Peng_ | pekuja: What do you mean by that? If you want to remove the new revisions from history, use uncommit. | 23:35 |
| pekuja | not like undoing the actual changes, just not including them at that point in my particular branch | 23:35 |
| Peng_ | Er. | 23:35 |
| Peng_ | I don't know what that means. | 23:35 |
| pekuja | ok | 23:35 |
| pekuja | I'm having trouble explaining it here... | 23:36 |
| pekuja | but yeah I think uncommit might be what I mean | 23:36 |
| pekuja | I just meant I'm not looking into removing the changes such that if the other user were to pull from my branch later, they'd have the changes removed | 23:36 |
| pekuja | so basically, a pull fetches me changes from another user's branch and commits them in my branch, while a merge will get me the changes but commit nothing? (so that I can resolve any conflicts and then commit when the code is ok) | 23:38 |
| Peng_ | A pull makes your branch a mirror of another branch. A merge lets you, well, merge changes into your branch, without having to throw out your unique history. | 23:41 |
| === mw is now known as mw|out | ||
| disturbedsaint | markh | 23:57 |
| disturbedsaint | still get the same error | 23:57 |
| disturbedsaint | added the print win32event.__file__ but where would it print to? since the error happens when opening the file-open dialog box | 23:58 |
| markh | is should print to win32traceutil, just above the ImportError traceback | 23:58 |
| markh | it should print the path to a .pyd file, and it should be the win32event.pyd next to win32pipe.pyd | 23:59 |
| disturbedsaint | ah, got it! | 23:59 |
| disturbedsaint | C:\Program Files\TortoiseHg\win32event.pyd | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!