| dash | Crud | 00:21 |
|---|---|---|
| dash | shelve ate my changes :( | 00:22 |
| dash | i'm using loom, I shelved some changes, then did down-thread | 00:22 |
| dash | after doing up-thread and reverting the files, unshelve complains that a file id doesn't exist in the tree | 00:22 |
| mwhudson | dash: :( | 00:24 |
| dash | is there a way to read stuff out of a pack file | 00:24 |
| dash | or partially apply this shelf | 00:24 |
| mwhudson | probably | 00:34 |
| dash | that's great | 00:34 |
| dash | i guess. | 00:34 |
| jml | dash, I don't think there's a way to partially unshelve from the UI. | 00:36 |
| dash | ah well, it's only 7 conflicts anyway, i'll just redo it and be careful this time. :) | 00:37 |
| lifeless | dash: please file a bug | 00:55 |
| lifeless | dash: on bzr | 00:55 |
| dash | ok | 00:55 |
| ddaa | Hey there. | 01:03 |
| ddaa | It seems reviewboard 1.0 has some trouble handling patches whose base is not in the main history of a branch. | 01:04 |
| poolie | hello ddaa | 01:05 |
| ddaa | Here, I'm submitting reviews with diffs produced by merging repo/feature into repo/trunk, and I base them in reviewboard on repo/feature. | 01:05 |
| ddaa | It works okay the first time. Then I have a branch "cowbell" which gets an additional commit for review fixes, | 01:06 |
| ddaa | Then "cowbell" is merged to trunk (where a conflict is resolved). And a branch "moreso", initially based on "cowbell", merges trunk back. | 01:07 |
| ddaa | Then I cannot find how to give an updated diff to reviewboard for the changes in "moreso" over trunk. | 01:07 |
| ddaa | poolie: hello pal | 01:08 |
| ddaa | So, anyone here has experience with reviewboard and could help me? | 01:08 |
| ddaa | poolie: What's up on down under? | 01:09 |
| lifeless | ddaa: statik does | 01:11 |
| * ddaa takes a kitty and rubs it on statik | 01:12 | |
| * ddaa loves to have fun with statik electricity | 01:12 | |
| lifeless | ddaa: I think he even wrote the reviewboard bzr stufff | 01:12 |
| * ddaa tries pushing to moreso a merge from moreso into trunk. | 01:17 | |
| ddaa | Nope, I get again "The file id "None" is not present in the tree <Inventory object at b9a9c4cc... blah blah blah" | 01:21 |
| ddaa | I guess there might be a way to make it work by providing a parent diff, but in this case I have no idea what it should be. | 01:22 |
| ddaa | Mh... I guess maybe statik in on the wrong hemisphere to be up at this time. | 01:24 |
| lifeless | is there a bug tracker for the reviewboard bzr plugin | 01:24 |
| lifeless | ? | 01:24 |
| ddaa | there's probably launchpad | 01:25 |
| ddaa | actually, it seems not | 01:26 |
| ddaa | I guess it's sharing bug tracker with reviewboard itself. | 01:26 |
| jml | lifeless, can you please create a pqm-managed branch for the 1.17 rc? | 01:28 |
| jml | or maybe http://doc.bazaar-vcs.org/bzr.dev/developers/cycle.html needs to be updated to say 'ask a losa'. | 01:28 |
| ddaa | lifeless: I'm producing the diagnostic data you asked me a few weeks back. | 01:35 |
| ddaa | The throughput appears to be a bit better now with 1.16.1 on both sides. | 01:36 |
| ddaa | But it's still very variable. | 01:36 |
| ddaa | no clear stalling though | 01:37 |
| ddaa | much better, 4m9s real time | 01:38 |
| ddaa | Comparing now to an upload of a tar of the .bzr in the repo | 01:39 |
| ddaa | scp of tar of .bzr, 4m39s real time | 01:44 |
| ddaa | meh... it's actually slower than bzr push | 01:44 |
| ddaa | my uplink officially sucks so much they could it in the LHC | 01:45 |
| ddaa | lifeless: so nothing to see, bzr push in 1.16 with 1.9 format repo is as fast as uplink. Maybe it was a temporary internet problem, or something to with the structure of the repo just after fast-import runs. | 01:46 |
| ddaa | I guess you are not interested in the -Dhpss log then. | 01:47 |
| lifeless | jml: it should say losa preferentially | 02:02 |
| poolie | hullo jml | 02:34 |
| poolie | ddaa, things are good here | 02:34 |
| poolie | barcelona was nice | 02:34 |
| lifeless | ddaa has logged :P | 02:34 |
| poolie | ah, i have that squelched in irssi | 02:39 |
| poolie | too noisy otherwise | 02:39 |
| RenatoSilva | verterok: https://bugs.eclipse.org/bugs/show_bug.cgi?id=282226 | 03:10 |
| ubottu | bugs.eclipse.org bug 282226 in CVS "CVS feature abstraction" [Enhancement,New] | 03:10 |
| * spiv -> lunch | 03:56 | |
| === NfNitLoo` is now known as NfNitLoop | ||
| thumper | abentley: ping | 04:31 |
| thumper | abentley: nm | 04:31 |
| poolie | hello thumper | 04:48 |
| thumper | hi poolie | 04:48 |
| * thumper wishes quassel was smarter with tab completion | 04:48 | |
| abentley | thumper: hi. | 04:50 |
| thumper | abentley: I was just wanting a reminder of the bzr send command to send relative to the pipe below, but I found it in my command history | 04:50 |
| thumper | bzr send -r branch::prev.. for those interested | 04:50 |
| abentley | thumper: It's also in "bzr help pipelines". | 04:51 |
| abentley | s/pipelines/pipeline | 04:51 |
| abentley | thumper: Well, the version for diff is. | 04:52 |
| thumper | abentley: right, that is what I wanted | 04:52 |
| lifeless | thumper: glad you like the idea | 05:10 |
| lifeless | thumper: it came out of a discussion with poolie about 'targetting' reviews | 05:10 |
| lifeless | thumper: I'm very keen to mae it easy for people to get engaged without us having to know a-priori who they are | 05:10 |
| === poolie_ is now known as poolie | ||
| lifeless | args | 05:24 |
| lifeless | (Pdb) locals()['args'][1] | 05:24 |
| lifeless | AssertionError(u"path_utf8 is not a str: <type 'unicode'> base/\u65e5\u672c\u4eba",) | 05:24 |
| lifeless | (Pdb) str(locals()['args'][1]) | 05:24 |
| lifeless | *** UnicodeEncodeError: 'ascii' codec can't encode characters in position 46-48: ordinal not in range(128) | 05:24 |
| lifeless | so | 05:24 |
| lifeless | test suite epic fail | 05:24 |
| lifeless | another reason not to raise AssertionError - it won't always format sanely >< | 05:24 |
| spiv | Yeah, exception formatting in Python isn't perfect. | 05:33 |
| abentley | thumper: I'm thinking the "take-changes" command we talked about adding to pipeline should actually be "merge --interactive", i.e. part of core. | 05:34 |
| thumper | abentley: but I only want text changes not any merge revisions | 05:34 |
| thumper | as long as it does that | 05:35 |
| thumper | I'd be happy | 05:35 |
| abentley | thumper: when we do partial merges, we don't set pen ding merges, if that's what you mean. | 05:35 |
| abentley | s/pen ding/pending | 05:35 |
| thumper | what about an interactive merge that takes everything? | 05:35 |
| lifeless | I'd love to see that | 05:36 |
| lifeless | I did a hacky one for bzrtools but never wrote enough tests to get it accepted ;P | 05:37 |
| lifeless | thumper: it could ask about full merges | 05:37 |
| abentley | thumper: well, the theory is that it would set pending merges. | 05:37 |
| lifeless | thumper: why don't you want merge revisions though? | 05:37 |
| lifeless | (we plan to eventually record partial merges too, in some fashion, to aid reporting of cherrypicks) | 05:38 |
| thumper | abentley: jml has work in progress for a cleaned up merge interactive I believe | 05:39 |
| spiv | There's always bzr revert --forget-merges if you really don't want merges recorded. | 05:39 |
| lifeless | jml: did you get the branch made? | 05:40 |
| poolie | lifeless: those decorator generators are kind of cute | 06:05 |
| poolie | maybe almost too cute | 06:05 |
| lifeless | poolie: we have many delta appliers | 06:07 |
| lifeless | I was hoping to structure things to allow reuse | 06:07 |
| lifeless | they could be structed as 'here, check this list', but that then requires that we have a list | 06:08 |
| poolie | mm | 06:14 |
| poolie | so you could have an explicit 'fan out this iterable' function | 06:15 |
| poolie | there may be one in itertools? | 06:15 |
| poolie | which calls some things for side effects and then yields the results of the original iterable | 06:15 |
| poolie | this is essentially just to split out the 'for thing:... yield thing' from those functions | 06:15 |
| poolie | to make it clear they don't change | 06:15 |
| poolie | but i'm not sure that's much better | 06:16 |
| poolie | anyhow, +1 | 06:16 |
| lifeless | thanks | 06:18 |
| lifeless | I have the test fallout fixed | 06:18 |
| lifeless | http://pastebin.ubuntu.com/214176/ | 06:20 |
| poolie | k | 06:20 |
| lifeless | if you could eyeball that | 06:20 |
| poolie | i'm going back to bug 391411 | 06:20 |
| ubottu | Launchpad bug 391411 in bzr "want "reconfigure --unstacked" or --stacked-on" [High,In progress] https://launchpad.net/bugs/391411 | 06:20 |
| poolie | oh ok | 06:20 |
| lifeless | I just got that done before saying 'thanks' ;) | 06:20 |
| lifeless | it corrects a couple of bugs in the validation code I added by testing against unicode entries, and cleans up some other tests that were expecting a different interface | 06:21 |
| lifeless | and removes a doctest error case that really wasn't very helpful where it was. I did some doc cleanup at the same time. | 06:22 |
| poolie | so in the 'parents = set()' thing | 06:22 |
| poolie | can you explain in the comment which parents will be in this list | 06:22 |
| lifeless | sure. Its all of them. | 06:22 |
| poolie | all in the whole dirstate? | 06:22 |
| poolie | ok | 06:22 |
| lifeless | all in the delta | 06:23 |
| lifeless | we don't know parents for removed items | 06:23 |
| lifeless | I'll add some text | 06:23 |
| poolie | maybe change dirname and basename to dirname_utf8 and basename_utf8, as they seem to be | 06:24 |
| lifeless | roger | 06:24 |
| lifeless | will do the same in check_parents too | 06:24 |
| lifeless | poolie: anything else? and I'll let you get back to 391411 | 06:27 |
| poolie | still reading | 06:31 |
| poolie | looks good | 06:32 |
| lifeless | thanks | 06:32 |
| poolie | i might put up a patch sometime that renames the other directories to per_workingtree etc | 06:33 |
| poolie | spiv, in bug 391411 i'm thinking about how to do reconfigure --unstacked to an hpss branch | 06:33 |
| ubottu | Launchpad bug 391411 in bzr "want "reconfigure --unstacked" or --stacked-on" [High,In progress] https://launchpad.net/bugs/391411 | 06:33 |
| poolie | it needs to fetch from the fallback repository into the to-be-unstacked one | 06:34 |
| lifeless | poolie: I would like that; making them consistent again would be nice | 06:34 |
| poolie | i think, unless you know something really clever, i need a new Client | 06:35 |
| poolie | do you know a tasteful way to get one? | 06:35 |
| poolie | k | 06:35 |
| lifeless | SmartServerClient? | 06:35 |
| lifeless | they are coupled to the transport; the most robust way would be 'b2 = bzrlib.branch.Branch.open(self.base)' | 06:36 |
| poolie | yeah | 06:39 |
| poolie | that's what i had in mind too - we don't implicitly share by url, so going back to a url should force a new connection | 06:40 |
| lifeless | I think you should be able to solve this without writing specific code in remote.py at this point in time | 06:40 |
| poolie | i think so too | 06:42 |
| poolie | as i said on the phone it would almost be possible to do it over one connection | 06:43 |
| poolie | but simple=good | 06:43 |
| lifeless | I suggest a comment about the rationale | 06:45 |
| lifeless | for review streamlining :) | 06:45 |
| spiv | poolie: yes, I think you need a new client, well a new medium really... | 06:46 |
| spiv | poolie: It might be nice to have a method on _SmartClient that can make a new connection for you, but as lifeless says taking the URL and constructing a new transport from that will work. | 06:47 |
| GungaDin | How do I change the user to checkout stuff with? | 06:57 |
| lifeless | GungaDin: what do you mean? | 06:57 |
| GungaDin | my account user is X and I'd like to checkout from the repository as user Y. | 06:58 |
| poolie | over ssh? | 06:58 |
| lifeless | you can put Y@ into the url | 06:58 |
| lifeless | if its launchpad however, you should use groups to manage this sort of thing, rather than impersonation | 06:59 |
| GungaDin | yeah, alright. | 07:03 |
| GungaDin | it's working now. | 07:03 |
| GungaDin | thx | 07:03 |
| lifeless | happy to help | 07:03 |
| lifeless | poolie: EOD; ciao | 07:09 |
| lifeless | well, nearly | 07:10 |
| lifeless | ringing jml first | 07:10 |
| poolie | cheerio | 07:23 |
| vila | hi all | 07:35 |
| poolie | hi vila | 07:41 |
| vila | hey poolie ! | 07:44 |
| poolie | vila does bug 397716 ring any bells with you? | 07:50 |
| ubottu | Launchpad bug 397716 in bzr "timezone-dependent annotation test failures" [High,Confirmed] https://launchpad.net/bugs/397716 | 07:50 |
| vila | hmm, indirectly yes | 07:51 |
| vila | it's "It's yesterday in California" again :) | 07:51 |
| poolie | again :) | 07:52 |
| vila | so, I think there is a TZ arg somwehere that can be used (it was the case for log, not sure for annotate) | 07:52 |
| poolie | arguably we should just set it in the tests for the sake of isolation | 07:53 |
| poolie | however i think in some environments setting it after the program starts is not enough | 07:53 |
| vila | I think the case you're encountering is only relevant in tests (it was the case for log when I saw that), if I'm not mistaken the problem here is that the TZ is not used coherently between commit and annotate, you can't do that from command-line | 07:55 |
| * vila . o O ( TZ... Yet another interesting test farm variation...) | 07:56 | |
| vila | wow, 'tranche' is used in English ? | 07:58 |
| bob2 | yes | 07:58 |
| vila | And it applies to ham as well as building houses ? | 07:59 |
| poolie | lol | 07:59 |
| poolie | :) | 07:59 |
| poolie | it mostly applies to finance actually | 07:59 |
| poolie | but it would be a nice word to use for ham | 07:59 |
| poolie | where did you see that? | 08:00 |
| vila | bzr.dev@4524 commit message :) | 08:00 |
| vila | no connection to money here :) | 08:00 |
| vila | "a portion of something " says my gnome-dictionary-applet... The french word come from "trancher" i.e. cut with a knive or sword, so I think literal translation should be slice :) | 08:02 |
| poolie | yes, i was just going to say that | 08:02 |
| poolie | i guess with the connotation that, perhaps, you eventually intend to eat all of it | 08:02 |
| vila | Really ? Interesting, not the case in French :) | 08:03 |
| fullermd | Did somebody say 'eat'? | 08:03 |
| * fullermd perks up. | 08:03 | |
| poolie | mm, actually i do think that's why you'd use that word specifically | 08:03 |
| poolie | that there are a small finite number and you expect them all to be taken | 08:04 |
| vila | well, it's really used for ham and you really don't want to eat a full ham, 2 tranches, maybe 3 but no more :-) | 08:04 |
| vila | ha, yes, the set of tranches is expected to be all eaten :) | 08:05 |
| * fullermd thinks you underestimate his stomach for swine... | 08:05 | |
| * vila wonders what happens when you feed fullermd after midnight.... | 08:06 | |
| * poolie gets undistracted | 08:07 | |
| fullermd | That's where adjusting TZ helps, see ;) | 08:07 |
| vila | poolie: regarding bug 3977716, looking at test_annotate it looks like the timezone parameter get lost in the refactoring, good diagnosis | 08:07 |
| ubottu | Error: Launchpad bug 3977716 could not be found | 08:07 |
| vila | what.. too much 7 ? Can't you just fix such obvious typos on the fly ? Come on... bug #397716 | 08:11 |
| ubottu | Launchpad bug 397716 in bzr "timezone-dependent annotation test failures" [High,Confirmed] https://launchpad.net/bugs/397716 | 08:11 |
| vila | poolie: I can reproduce the bug, are you working on it or should I assign it to me ? | 08:15 |
| poolie | i'm not now | 08:15 |
| poolie | i'm trying to finish 391411 before s gets home :) | 08:15 |
| vila | poolie: ok, go ! | 08:16 |
| lifeless | poolie: interestingly, wiktionary has the finance definition as the 2nd meaning | 08:16 |
| poolie | begone, forces of distraction | 08:17 |
| lifeless | its friday | 08:17 |
| lifeless | friday night | 08:17 |
| poolie | :) | 08:17 |
| vila | yeah, they are stronger :) | 08:17 |
| poolie | well, it is the more specific use | 08:18 |
| poolie | i think it's also the place you most commonly see it | 08:18 |
| * vila just feels the difference since he changes its TZ to utc+10... | 08:18 | |
| poolie | nothing wrong with your use of course | 08:18 |
| * vila blesses the one who removed ctrl-alt-backspace *default-and-hard-to-get-rid-of* shorcut that used to kill the X server, thank you, thank you, thank you | 08:38 | |
| pygi | vila: why lol? :D | 08:38 |
| pygi | don't be silly, shooting xserver is cool | 08:39 |
| vila | pygi: because the shorcut was too close to alt-backspace which I use a lot and killing my X server without confirmation (yeah I know, non-sense, but yet) and bringing down my http client, mail client, chat client, bunch of emacses just because I mystyped 'delete-word-backwards' is a not excessive for my taste | 08:41 |
| vila | s/not/bit/.... some typos... are... not understandable :) | 08:41 |
| * vila looks its keyboard... yes io and bn are contiguous on qwerty... clap-clap-clap, well seen big brain :) | 08:45 | |
| vila | s/its/his/ | 08:45 |
| poolie | that was quick :) | 09:01 |
| vila | poolie: still there ? Regarding lp:~mbp/bzr/trivial into lp:bzr, let me know before leaving if you want me to do the tweaks and merge | 09:29 |
| poolie | hi | 09:47 |
| poolie | i am | 09:47 |
| poolie | i think i fixed 391411 | 09:48 |
| poolie | thanks for reviewing it | 09:50 |
| poolie | oh you didn't need to spend so long making all those dittos | 09:51 |
| poolie | i probably should leave so if you'd like to sort them that would be nice | 09:52 |
| poolie | i actually have mixed feelings about sorting them as part of an otherwise-mechanical change | 09:53 |
| vila | poolie: you actually have or had ? The intent of your patch is to be more coherent in naming IMO, that's good reason to *not* break another convention :) | 10:10 |
| poolie | :) | 10:10 |
| poolie | have | 10:10 |
| poolie | just in having less risk of breaking things | 10:10 |
| poolie | but you're probaly right | 10:11 |
| vila | ha ! That should be guarded by a full test suite passing :) | 10:11 |
| poolie | :) true | 10:16 |
| poolie | ok, good night | 10:16 |
| === sabdfl1 is now known as sabdfl | ||
| saedelaere | hi, i'am completely new to bazaar and version control system. One thing i don't understand from the manual. I want to ignore to directories completely by "bzr add" | 12:01 |
| saedelaere | as i understood correctly i can use .bzrignore for this task. I tried for example "org_icons/*.*" but still files in that directory will be added. Where do i have to put the file ".bzrignore"? thank you! | 12:01 |
| fullermd | .bzrignore goes in the root of the tree. | 12:05 |
| fullermd | And you probably want 'org_icons/*' more, though I guess it likely doesn't make a huge difference in this case... | 12:06 |
| lamalex | Hi, i just ran bzr upgrade on my repo and now I get this -> bzr: ERROR: The branch lp:do-plugins has no revision None. | 12:14 |
| saedelaere | fullermd. ok i think i got it | 12:15 |
| saedelaere | thank you | 12:15 |
| lamalex | this is mm .. kind of serious | 12:16 |
| lamalex | wtfff I can do a merge frm lp:do-plugins but i cant branch | 12:23 |
| vila | lamalex: I can branch lp:do-plugins without problem from here, what bzr version are you using ? | 12:27 |
| lamalex | vila: really? | 12:28 |
| lamalex | what does bzr info -v say for you? | 12:28 |
| vila | lamalex: do you always reply to a question by another question ? | 12:28 |
| lamalex | vila: almsost always | 12:28 |
| lamalex | Bazaar (bzr) 1.16.1 | 12:28 |
| vila | with bzr.dev I got a repository: Packs containing knits without subtree support, branch format 6 | 12:29 |
| vila | and the remote branch has the same repo/branch characteristics | 12:30 |
| lamalex | hmm... what the hell | 12:30 |
| lamalex | i just bzr upgraded it to 1.6.1-rich-root | 12:30 |
| vila | so that's pack-0.92, it's pretty old now, what did you upgrade from ? And when ? | 12:30 |
| lamalex | and now I can't branch, but you can, and you have the wrong format | 12:30 |
| vila | lamalex: ha, we are not seeing the same branch then, certainly due to the fact that you have write access, so I still see the old one because it hasn't been mirrored yet | 12:32 |
| lamalex | i wonder what wnet wrong | 12:33 |
| * lamalex restores backup | 12:33 | |
| vila | what is your .bzr.log saying ? | 12:33 |
| lamalex | vila: http://paste2.org/p/314256 | 12:34 |
| vila | 1) try without --stacked, 2) try with bzr.dev | 12:35 |
| lamalex | ive tried without --stacked | 12:35 |
| lamalex | same thing | 12:35 |
| lamalex | will try bzr.dev | 12:35 |
| lamalex | wwait what is bzr.dev | 12:36 |
| vila | with and without --stacked (although if you have a local mirror using --stacked doesn't gain you much compared to a shared repo) | 12:36 |
| vila | bzr.dev is lp:bzr | 12:36 |
| vila | lamalex: what OS are you using ? | 12:36 |
| lamalex | ubuntu 9.04 with bzr ppa | 12:37 |
| vila | hmm, I can try to help you setup bzr from sources but you may prefer switching temporarily to the nightly ppa | 12:38 |
| lamalex | i just reverted it to the pack-0.92 | 12:38 |
| lamalex | going to try this again.. | 12:39 |
| lamalex | is there anything special i should know aobut upgrading? | 12:39 |
| lamalex | i've gotta be doing something wrong | 12:39 |
| vila | what did you do ? Why did you chose 1.6.1-rr instead of say --1.9-rr ? | 12:40 |
| vila | or even 1.14-rr or --default-rr ? | 12:40 |
| vila | and why do you want to upgrade to start with ? :-) Mainly curious but it may help understand the issue... | 12:41 |
| lamalex | we want stacked branches | 12:42 |
| vila | locally or on lp ? | 12:42 |
| lamalex | and we chose 1.6.1-rich-root because I think it was the greatest that jaunty bzr supported | 12:48 |
| lamalex | vila: on lp | 12:48 |
| lamalex | would you say not to use 1.6.1? | 12:49 |
| vila | hooo, yes sorry, so used to ppas, I forgot about the version shipped with jaunty, but are you sure it's 1.6 that sounds really old... | 12:49 |
| lamalex | RAOF said 1.6, I didnt check myself. I trusted his opinion on 1.6.1 | 12:50 |
| vila | http://packages.ubuntu.com/jaunty/bzr says 1.13 | 12:50 |
| vila | RAOF ? | 12:51 |
| lamalex | a person | 12:51 |
| vila | ha, ok :) | 12:51 |
| lamalex | does our packaging, is generally more or less knowledgable about things like this | 12:51 |
| lamalex | so you think we should do 1.13-rr | 12:51 |
| vila | lamalex: no :-) that one doesn't exist but you can use 1.9-rich-root | 12:52 |
| lamalex | heh | 12:52 |
| vila | try 'bzr help current-formats' | 12:52 |
| lamalex | whats the advantage of rich-root over normal besides svn/git | 12:53 |
| npoektop | yo! is there a way to ignore executables in my code repository other than marking them with .exe (or smth) extension? | 12:54 |
| lamalex | npoektop: .bzrignore? | 12:54 |
| vila | none, but since you are migrating you'd better take the rich-root route once because it will become the default once we reach 2.0 | 12:54 |
| lamalex | vila: ok :) | 12:55 |
| npoektop | lamalex: how to ignore executables? | 12:55 |
| vila | the problem is that converting to rich-root is a one-way street, you can't come back nor interoperate with non-rr | 12:55 |
| lamalex | so for upgrading- bzr upgrade --format=1.9-rich-root lp:do-plugins /should/ work? | 12:55 |
| vila | lamalex: yes | 12:56 |
| lamalex | hm | 12:56 |
| * lamalex runs a check and a reconcile first just to be safe | 12:56 | |
| vila | but then you should also upgrade all branches you want to interact with it | 12:56 |
| lamalex | right, we know that | 12:56 |
| vila | good reflex, sorry, should have mentioned it :-/ | 12:56 |
| vila | then you need to make sure the branch is mirrored (see #launchpad for that, I'm not sure what the right procedure is needed here) | 12:57 |
| lamalex | will do | 12:57 |
| vila | since you have write access to lp:do-plugins, you cant really see the mirror yourself (that's why we got different results) | 12:58 |
| lamalex | i can use a different account | 12:58 |
| vila | that should do the trick as long as the other account doesn't have write access :) | 12:58 |
| lamalex | heh :) | 12:59 |
| vila | Is there a LOSA around ? I've got a very stange failure on PQM, as if some old python modules were still present in the working tree... a make clean there may address that | 13:01 |
| npoektop | how to ignore executables in .bzrignore? | 13:03 |
| vila | npoektop: by listing them either explicitly or by using a regexp, but there are no way to automatically recognize executables (so far) | 13:04 |
| npoektop | now i mark them with .exe, but it looks ugly | 13:05 |
| vila | npoektop: to you a lot of them ? | 13:05 |
| vila | npoektop: do you a lot of them ? | 13:05 |
| npoektop | yes, i have ~/code with many small projects | 13:06 |
| mzz | well, bzr does know which are marked executable (if you're on a filesystem that supports this) but there's no way to use that info in .bzrignore | 13:07 |
| mzz | I wonder if a plugin could add that | 13:07 |
| npoektop | good idea | 13:08 |
| === kiko-fud is now known as kiko | ||
| amanica | vila: did you want me to change that test or can I just go ahead and resubmit? | 13:30 |
| amanica | (I need to leave soon for the weekend) | 13:30 |
| vila | amanica: just a sec, how long soon ? | 13:31 |
| amanica | 20 minutes | 13:31 |
| vila | amanica: it's ok, these tests could use more love anyway, if only to stop matching texts when we can use LogCatcher to get more precise comparisons | 13:35 |
| amanica | vila: I didn't mean to rush you, but thanks. yes that makes sense. | 13:35 |
| vila | amanica: if you keep working on log, I'd really appreciate if you could try to put more tests in tests/test_log.py and less in tests/blackbox/test_log.py :-D Not a requirement, but I'll appreciate :) | 13:36 |
| amanica | vila, thats a pet peeve of me too | 13:36 |
| amanica | but that sounds like a project on its own | 13:36 |
| vila | amanica: no problem, nagging was perfectly reasonable here, I read the whole thread and then forgot that mentioned waiting for a feedback, sorry :-/ | 13:36 |
| vila | amanica: nahh, once test a time :) | 13:37 |
| amanica | cool | 13:37 |
| vila | amanica: I'd like the log tests to be as concise as the ones I lastly wrote for push and send (if you're interested) | 13:37 |
| vila | too many tests try to test too many aspects of log, each time we tweak a particular aspect we have to fix a bunch of not directly related tests: that's a clear sign of bad defect localization :) | 13:38 |
| amanica | vila: cool, an new chalenge! I won't mind doing that if I get time | 13:38 |
| vila | amanica: great ! | 13:39 |
| amanica | it helps if someone is interested enough to review quickly.. thanks | 13:39 |
| ddaa | statik: ping | 13:39 |
| vila | amanica: I know... | 13:39 |
| amanica | vila: if you have some thought you are welcome to write a short bug on this and assign it to me | 13:40 |
| amanica | /thought/thoughts | 13:40 |
| vila | amanica: ok | 13:41 |
| vila | amanica: I need to look at it again, but from memory, some tests can be refactored as is, some needs some refactoring of the code itself to better separate the various aspects, so I need to re-read some code, feel free to ping me again on the subject if I forget to file that bug | 13:43 |
| amanica | vila: cool, and you me | 13:43 |
| vila | ok :) | 13:43 |
| amanica | \me need to go soon | 13:44 |
| amanica | whoops | 13:44 |
| vila | amanica: enjoy your week-end ! | 13:44 |
| amanica | vila: thanks, you too | 13:44 |
| amanica | bye | 13:47 |
| === vila is now known as vila-away | ||
| ddaa | Ok, I found a way to make reviewboard work with my branching and merging situation. | 14:06 |
| ddaa | It something involving a "parent diff" | 14:06 |
| ddaa | If I understand correctly, reviewboard expects to have all diffs in the same review to have the same base. | 14:07 |
| ddaa | So. I have trunk-base as a common base. | 14:07 |
| ddaa | Then I have "feature" revision, and the first diff is trunk-base..feature. | 14:08 |
| ddaa | Then if I have a some more commits in trunk, leading to trunk-new. | 14:09 |
| ddaa | And I merge trunk-new in my feature branch, leading to feature-new. | 14:09 |
| ddaa | I must update the diff in the review by specifying the "feature" branch as repository path. | 14:09 |
| ddaa | trunk-new..feature-new diff as the new diff | 14:09 |
| ddaa | and the trunk-base..trunk-new diff as its parent diff | 14:10 |
| ddaa | Geez, that's so fricking complicated! | 14:10 |
| ddaa | Is there a simpler way to say the same thing? | 14:10 |
| ddaa | (jargon welcome) | 14:10 |
| mzz | I'm going to wildly guess you might be looking for "ancestor:" but I haven't actually parsed your problem description | 14:11 |
| ddaa | mzz: half of my problem is that i find the procedure to make revie | 14:11 |
| ddaa | to make reviewboard happy very difficult to explain. | 14:11 |
| ddaa | So I'm looking for better ways of explaining it. | 14:11 |
| npoektop | there is an option for commit: --unchanged, it makes it commit even if no changes in repository. i don't want to commit with no changes and i don't want to see the error message that no changes. it is for crontab task. i don't want to 2>&1 /dev/null because i want to see sufficient errors. how to do that? | 14:26 |
| === abentley1 is now known as abentley | ||
| lamalex | npoektop: why dont you do bzr stat -V first and only commit if there are changes? | 14:31 |
| * npoektop reading docs | 14:32 | |
| === mishok__ is now known as mishok13 | ||
| npoektop | lamalex: thanx | 14:33 |
| rockstar | jam, does TestCaseInTmpDir clean up after itself? | 14:44 |
| jam | rockstar: yes | 14:44 |
| rockstar | jam, great, thanks. | 14:44 |
| rockstar | jam, I should be more specific. Does it remove the temp dir it creates? | 14:48 |
| * ddaa still talking alone about reviewboard | 14:52 | |
| ddaa | To state it better, I think what's needed is providing branch-point..ancestor as the parent diff, and ancestor..last as the review diff. | 14:53 |
| ddaa | But there does not seem to be a way to select the branch point. | 14:54 |
| ddaa | I need something that allows me to find the latest revision that common to the mainline of the current branch and another branch. | 14:54 |
| ddaa | s/that common/that is common/ | 14:55 |
| LarstiQ | ddaa: based on -rancestor: ? | 14:55 |
| * ddaa thinks more... no actually I need something different. | 14:55 | |
| ddaa | LarstiQ: kind of. I'm trying to figure a way to state how to feed diffs to reviewboard. | 14:56 |
| ddaa | But common mainline ancestor does not work when the initial diff is feature-1->feature-2, and a later diff is trunk->feature-2-updated, because feature-1 was merged in trunk. | 14:58 |
| === vila-away is now known as vila | ||
| vila | rockstar: with some help from atexit, yes | 15:03 |
| rockstar | vila, yes, but the TestCase registers that handler right? I don't have to do anything special? | 15:04 |
| vila | rockstar: nothing special... except exiting from your python script :) | 15:04 |
| vila | rockstar: since you were more specific in your last question I thought you had special use case (or bug) in mind, so I tried to be extra-precise | 15:05 |
| rockstar | vila, thanks! :) | 15:06 |
| === mishok__ is now known as mishok13 | ||
| rockstar | What version of bzr introduced HookPoint? | 15:50 |
| rockstar | jam, ^^ Which version did you need for your Windows work yesterday? | 15:51 |
| garyvdm | Hi all | 16:02 |
| jrwren | I'm having some weird issues. we use centralized workflow, and 1 person is having an issue when he does bzr up, he regularly gets conflicts that others don't get. On files that he has not touched at all. | 16:18 |
| jrwren | most recently its "file already exists" and moving them to .moved files and showing that as a conflict. | 16:20 |
| jam | rockstar: sorry about the delay.. I don't know what version introduced it. I'll check | 18:17 |
| jam | (I just installed bzr.dev because that was the easiest) | 18:17 |
| rockstar | jam, okay. Not a big deal, we're just wanting to package a new Tarmac soon. | 18:18 |
| jam | rockstar: looks like bzr 1.13 add hooks.known_hooks | 18:18 |
| rockstar | (We're sprinting on Tarmac currently) | 18:18 |
| jam | real sprinting, or virtual sprinting? | 18:19 |
| al-maisan | Hello there, is there a way to go back a revision in a branch. I did a "bzr pull" but would like to go back to rev N-1 | 18:41 |
| Tak | al-maisan: temporarily, or permanently? | 18:43 |
| Tak | jrwren: does it still happen if he does a clean checkout? | 18:45 |
| jrwren | Tak: probably not, no. | 18:53 |
| jrwren | but finding why it happens at all would be more useful | 18:53 |
| Tak | my first WAG looking at the symptoms is that for some reason his checkout doesn't think it's on the same tree as upstream | 18:58 |
| Tak | or maybe he reverted to some old revision and then updated from the server before reverting to head? | 18:59 |
| * al-maisan has an idea: I can make another local branch and specify -r before:N | 19:12 | |
| Tak | or you can `bzr revert -r whatever` | 19:14 |
| al-maisan | ah OK | 19:14 |
| al-maisan | Thanks. | 19:15 |
| fta | how do i specify a different email address for a directory containing a lot of branches? | 20:29 |
| * SamB can't help but think of some kind of alist | 20:32 | |
| === ddaa1 is now known as ddaa | ||
| RenatoSilva | verterok: hi Guillermo, I've answered your comment about bzr-java-lib test. I suspect you don't have UTF-8 set either :) maybe it's just using system's default just like me :) how about including the .project and other stuff in lp's branch? | 21:12 |
| verterok | RenatoSilva: Hi, I just got the email | 21:12 |
| verterok | RenatoSilva: yes, I'm using UTF-8 at a workspace level | 21:12 |
| verterok | RenatoSilva: the eclipse config files are generated by maven | 21:13 |
| verterok | RenatoSilva: I'll look how to force maven to set UTF-8 | 21:13 |
| RenatoSilva | verterok: ok, but people could be using bzr-eclipse's new project wizard | 21:14 |
| RenatoSilva | verterok: and forget to run mvn | 21:14 |
| verterok | RenatoSilva: heh, yes, but in the case of bzr-java-lib, executing mvn eclipse:eclipse is a requirement, it's in the README ;) | 21:15 |
| RenatoSilva | verterok: ok :) | 21:15 |
| RenatoSilva | verterok: the file .settings/org.eclipse.core.resources.prefs is the one which stores project encoding | 21:16 |
| verterok | RenatoSilva: oh, nice | 21:16 |
| verterok | RenatoSilva: ok, I'll look into that | 21:17 |
| RenatoSilva | ok | 21:17 |
| verterok | RenatoSilva: fwiw, I landed some branches yesterday in bzr-eclipse (also in the headless build branch) and bzr-java-lib | 21:19 |
| RenatoSilva | ok | 21:21 |
| === vxnick_ is now known as vxnick | ||
| === abentley1 is now known as abentley | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!