[00:00] will let you know if it solved it [00:00] thanks [00:00] beuno: i'm a bit surprised by the bzr-pqm failure because afaics iter_changes does _not_ require 8 arguments in 1.9rc1 [00:01] poolie: It's _iter_changes, but *that* shouldn't require 8 arguments either. [00:01] right [00:02] I don't know what happened there. I've been treating the sympoms because that's an old version anyhow. [00:02] poolie, I was as well, but since slapping on the new version "just worked", I carried on without diving too deep into it [00:03] fair enough [00:21] beuno: merged my fix for search? [00:22] lifeless, argh, no [00:22] I will now [00:22] beuno: nag nag nag [00:22] it's on my starred emails [00:22] which have grown out of proportion [00:23] beuno: FWIW seeing this has increased my 'do not do big layout cleanups' twitch factor [00:24] yeah [00:24] it did for me as well [00:24] also, it was a patch from someone [00:24] not something I actually did myself [00:24] k [00:24] well they don't understand python as much as they think they do :> === kiko is now known as kiko-zzz [00:25] seems not [00:26] and, I should pay a little more attention, or just not merge those things [00:27] hrm [00:27] more test coverage would reduce the risk [00:27] that change still doesn't fix the problem [00:27] show me your diff? [00:27] cause it WFM [00:27] yeah, tests are high up there next to "make it stop eating ram until it blows up" [00:27] which we kinda know what's doing it now [00:28] bug 293750 might be fixed now poolie [00:28] Launchpad bug 293750 in bzr "Add paramiko SSH library to Windows installer" [Undecided,New] https://launchpad.net/bugs/293750 [00:28] lifeless, http://paste.ubuntu.com/67620/ [00:29] beuno: that should do it [00:29] beuno: have you restarted? does command line search work? [00:29] command line works [00:29] I did restart [00:29] do you have latest trunk? [00:29] what is the first exception [00:30] rev 235 [00:30] python-2.6 unsupported in 1.10dev ? [00:30] BasicOSX: EPARSE [00:31] File "/home/beuno/bzr_devel/loggerhead/trunk/loggerhead/controllers/__init__.py", line 98, in __call__ [00:31] vals.update(self.get_values(h, revid, path, kwargs, headers)) [00:31] TypeError: get_values() takes exactly 5 arguments (6 given) [00:31] lifeless: https://bugs.launchpad.net/bzr/+bug/293886 :-) [00:31] Launchpad bug 293886 in bzr "bzr: ERROR: exceptions.AttributeError: sendall" [Undecided,New] [00:31] BasicOSX: a regression I guess; no core devs I know of are usingn 2.6 regularly [00:31] BasicOSX: or more accurately, we haven't announced full 2.6 support yet [00:32] beuno: that exception is the symptom [00:32] it's what I get for being bloody edge [00:32] beuno: its hiding the error [00:33] beuno: when I saw that I looked higher up in the log and could see the real exception, IIRC [00:34] lifeless, ah, yes [00:34] beuno: I mean, you should fix that too; but its secondary [00:35] http://paste.ubuntu.com/67625/ [00:35] beuno: File "/home/beuno/bzr_devel/loggerhead/trunk/loggerhead/search.py", line 52, in search_revisions [00:35] beuno: print query there [00:36] lifeless, [('a',)] [00:38] beuno: at line 1221 [00:38] beuno: print key [00:38] beuno: it may be you've just found a unrelated bug [00:39] beuno: we can check this by doing a search for 'a' rather than a completion lookup for 'a' [00:39] (line 1221 of search/index.py I meant) [00:39] lifeless, ('a',) [00:39] yeah, I guessed that :) [00:40] so type a and hit enter in the search box [00:40] or search for something bigger [00:40] ah, see, I was trying the "find as you type" [00:40] searching works [00:40] yes, I know :P [00:40] ok [00:40] now in the CLI [00:40] try 'bzr search -s a' [00:40] on the branch that was erroring [00:41] aha [00:41] same error [00:41] ok [00:41] lh is fixed [00:41] push that anytime [00:42] prints (u'a',) [00:42] file a bug on the search - and I need a copy of the .bzr/bzr-search folder for the thing that errored [00:42] FWIW, 'bzr search -s a' works for me on an index of lh trunk [00:43] I suspect it will be a bzrlib index change [00:43] what bzrlib are you using? [00:43] lifeless, sent the tarball [00:44] I'm on 1.9dev [00:44] nightly PPA [00:44] k, just tried with .dev [00:44] worked on my index, I'll drop yours in [00:44] >>> bzrlib.__version__ [00:44] '1.9dev' [00:44] what branch does it index? [00:45] that's for lh's trunk [00:45] maybe it's an old format? [00:45] the search that is [00:45] nah [00:45] if it was normal search wouldn't work [00:45] and the next format is btree based, but needs btree prefix searching implemented [00:46] lifeless, deleting the .bzr/bzr-search and indexing again works [00:46] it'll be a corner case [00:46] (duh) [00:47] ah, email is still sending [00:47] 3.2mb apparently [00:47] cool [00:47] though you could have attached it to the bug :> [00:48] ah, I could, yeah [00:48] it's almost 2am here, european time doesn't seem to mix well with me [00:49] are you home? [00:50] I wish! [00:50] Spain [00:50] for a few days [00:50] then Washington DC [00:50] holidays? [00:50] no no, LP UI world tour [00:51] clearly I've missed some mails :) [00:51] what are you doing? [00:51] Launchpad UI [00:51] we're gearing up for a big change in 3.0 [00:52] I got the UI bit :P [00:52] did you hear that we where sprinting in London for 2 weeks? [00:52] what I mean is what are you doing at each location that can't be done from home [00:52] I knew about the EPIC [00:52] ah, sprints [00:52] with each team [00:52] go through aaaaaaaaaaaaaaaall the pages [00:52] wow [00:52] improve existing, plan for future dominance [00:52] you'll be fucked then [00:52] :P [00:53] yes, I'm starting to guess that :) [00:53] when do you come to .au? [00:53] I've been in nz [00:53] meh, sif that counts [00:53] :) [00:53] hehe [00:53] long enough trip for me [00:54] .au jr [00:54] lol [00:56] anyway, I'm off to sleep for a while [00:56] ping me if I can do anything else [00:56] that email is still sending :/ [00:56] g'night lifeless, and thanks for the patch + reminder [01:08] fud === Mapianka is now known as MapMan [04:31] * arjenAU is trying to work out how to use tag so that it behaves as wanted [04:32] it appears to apply to the last committed rev# not the next [04:32] that's just so odd [04:35] arjenAU: hmm? [04:36] commit --tag tags the next commit [04:36] lifeless: ah [04:36] so what happens if I do bzr tag separately after doing bzr commit? [04:36] does it kinda get attached to that commit, or? [04:36] you tag an existing revision [04:36] arjenAU: ie, the last one, so "yes" [04:37] lifeless: no I want to tag what i'm committing. [04:37] lifeless: but I understand what you're saying [04:38] so I should ideally just speify the --tag on the commit, that's clear. [04:38] arjenAU: so you want to record that you want to commit on the next commit [04:38] arjenAU: I don't think thats built-in, so you need to use --tag on the commit, yes [04:38] lifeless: exactly. see most htings operate as a thing that gets committed later. bzr tag adds onto the previous commit. that's kinda unexpected [04:39] bzr commit --tag works as expected [04:45] A question: When a repository is out of date, i.e. bzr update returns "working tree is out of date, run 'bzr update'" [04:45] that would be a working tree being out of date, not a repository [04:46] is there an easy way to determine how foar out of date the repository is [04:46] ? [04:49] Is it possible to determine what revision the state of the working tree corresponds to? [04:49] bzr info should tell you [04:50] That tells me what revision I would get if I run bzr update [04:50] Petrach: the wt has the revision id embedded in it, but not a revision number [04:51] Petrach: we should expose this I guess [04:51] Where would I have to look for that? [04:52] python -c 'import bzrlib.workingtree; t = bzrlib.workingtree.WorkingTree.open("."); t.lock_read(); print t.get_parent_ids()' [04:54] Ah, ok. Thanks [04:54] (sorry that its crude) [04:56] It's comprehensible enough, thanks [04:57] log --show-ids on the branch will let you find that rev [04:57] (unless someone uncommitted on the branch) [05:06] hi all [05:07] welcome back [05:16] poolie: so, want to talk split inv [05:37] echo "Obama" > president; bzr commit; [05:37] ;) [06:05] NfNitLoop: hehe [06:05] hmm lp not scanning branches at the mo it seems [06:07] arjenAU: no - am trying to figure out wtf is broken atm. [06:10] spm: no worries, was just noting [06:21] hi arjen [06:25] hey poolie [06:25] poolie: in case i haven't raved enough - bzr rocks [06:29] that's always nice to hear [06:30] not even craving back bk, this is just good. doing the weirdest cross-branch merges and it hasn't failed me yet [06:32] arjenAU: i was going to propose to do a tutorial at the developer conference [06:32] i think i need to send that tomorrow [06:33] poolie: euh, OSDC? won't be any tutes. [06:33] also, some canonical people including myself are going to be in brisbane next week, do you want to catch up? [06:33] no, the mysql conference [06:33] poolie: oh right. sounds good. [06:33] poolie: ehm in Melb Sun eve- Wed eve, then US from Fri arvo. other than that, fine ;-) [06:35] arjenAU: and to think I felt guilty about calling myself a Qlder still; even after moving from brisvegas to canberra 18ish years ago. At least when I lived there, I *lived* there. ;-) [06:35] heh [06:35] where were you, spm? [06:36] In brisbane? jindalee - since about 71/72 ish. [06:36] I can *just* remember scenes from the 74 floods [06:39] poolie: what about yourself? I believe we went to *cough* .. HIGHLY... rival high schools. :-) [06:40] in brisbane from about 1980 to 1999, and I went to BGS [06:44] arjenAU, so i suppose you'll be pretty busy, but maybe we could meet for lunch or during the day on Thursday? [06:55] lifeless: if you're still around, do you have an easily obtainable test branch in your new format? [06:58] poolie: the only precanned branch i have is the 18GB one on banchmarks [06:59] generally I take plugins and upgrade a copy [06:59] in that robertc directory somewhere? [06:59] yah [06:59] like of the bzr-gtk plugin? [06:59] but bzr branch bzrtools foo; cd foo; bzr upgrade --development3 [06:59] is quite fast [07:01] poolie: and with that, I'm going to call 'day' [07:02] i'm going to head off soon too [07:02] cheerio [07:02] arjenAU: looks like we're scanning again [07:02] poolie: oh yes - huge rivals @ highschool - GT. :-) [07:09] hi all [07:10] hi vila [08:34] poolie: sure - you've got my mobile, right? [08:34] poolie: whereabouts will you guys be? === abadger19991 is now known as abadger1999 === lamont` is now known as lamont === kiko-zzz is now known as kiko-afk [10:25] what's the correct way to revert an (uncommitted) merge? [10:26] dissonans, bzr revert? [10:26] * LarstiQ nods [10:26] but, that will also revert any local changes you had [10:27] dissonans: if that is ok, then just `bzr revert` right ahead [10:27] hiya LarstiQ [10:27] dissonans: if you want to keep the file changes, but not the recording of the merge, supply --forget-merges to revert [10:27] beuno: heya :) [10:28] beuno: still in London? [10:28] LarstiQ, almost. In Spain now for the rest of the week [10:28] then Washington DC [10:28] LarstiQ: actually, I'd like to keep some changes from before the merge [10:28] but I guess bzr can't discern those from those introduced by merge? [10:28] dissonans: correct [10:29] dissonans: you could perhaps try to do something with merging the reverse changes [10:29] but that would be tricky [10:30] or [10:30] shelve [10:30] and go through the changesw [10:33] that would work if the merge didn't touch the same hunk as you changed yourself [10:33] and/or you had to resolve conflicts [10:38] yeah, I don't think there's a perfect and simple solution [10:50] that's why such a situation requires merge --force === timchen1` is now known as nasloc__ [11:38] how can I install bazaar 1.8 with tortoisebzr? the 1.8 win32 setup lite installer doesn't seem to include it, but I can't find a non-lite one [11:38] also is there any documentation/tutorial online for tortoisebzr [11:38] I have to collaborate with some not so technical windows users and I would really like to use bazaar [11:40] thrope: hi, i think you should try the 1.9rc1-2 installer instead [11:40] several problems have been fixed in tbzr packaging [11:40] ok [11:40] the trouble is I use 1.8 on other platforms [11:40] will it be ok to mix them [11:40] it will [11:41] unless you specifically choose the 1.9 format for something [11:41] i'm going to bed but if you hit problems ask someone here or on http://answers.launchpad.net/bzr [11:41] hmmm - it doesnt work anyway - get a dll error trying to init with tortoisebzr from 1.9 installer [11:41] really [11:41] do you have the -2 version? [11:42] it was just uploaded today [11:42] yes [11:42] i just downloaded it now [11:42] dll load failed with errorcode 193 [11:42] anyway I think I will leave it for now [11:44] please send a mail or file a question [11:44] so we can track it [11:44] possibly rebooting after installing would help that [11:44] anyhow, good night and good luck [11:46] is it possible to lock a branch so that no reads are possible? [11:50] chmod? ;) [11:55] rm -r ? :) === thekorn_ is now known as thekorn === bac-afk is now known as bac === kiko-afk is now known as kiko [14:39] hmm, how does one close a bug in launchpad? [14:40] I've already set status to "Fix Committed" ... [14:42] Tak: that depends on how the project wants to do things. [14:43] Tak: fix committed could mean that the bug is fixed in a particular branch, and Fix released means it's in trunk. [14:44] Tak: or fix committed could mean the bug is fixed in trunk, and fix released that is in a an actual release of the project. [14:46] it would be nice with a bug tracking software that knew about merges [14:46] I more meant, what needs to happen for the bug not to show up in the open bugs list [14:46] you mark a bug as fixed in one branch. when you merge that into trunk, the tracking software automaticly sets the bug as fixed in the trunk [14:55] jrydberg: yeah, either launchpad already does that or it's supposed to. [14:55] jrydberg: but what we really need, imo, is a different bug status to distinguish between merged to trunk and committed on a branch. [14:55] launchpad just links branches and bug reports, no? [14:55] it doesn't change the bug reports [14:56] Tak: either of those two statuses should do it afaict, if not, the Fix released certainly would. [15:02] apparently "Fix Released" does and "Fix Committed" does not === cody-somerville_ is now known as cody-somerville [15:28] question: i deleted a file a few revisions ago, and now i want it back. what's the best way to resurrect this file and keep its history from before? [15:31] gorgapor, a reverse merge would be in order. [15:32] does that bring back the file with the same fileid as well? [15:32] does revert -r do the trick? [15:33] ok, how do i do that? [15:34] i tried revert -r123 deleted_file, but it didn't work [15:38] gorgapor: I think it may be: bzr merge -r .. . (where n is the revision that deleted the file you want) [15:38] but I don't have a repo handy to test that. [15:38] okay i'll try that out [15:43] so, that seems to bring back the entire changeset [15:44] is there a way to just bring back the one file? [15:55] lifeless: ping? [15:55] eh [15:57] Hmm, searching in Loggerhead is busted in one branch, but not another. [15:59] Peng_, I patched trunk [15:59] did you upgrade? [15:59] also, found a bug in bzr search index [16:00] so you could delete de .bzr/bzr-search [16:00] and re-index [16:04] beuno: Yeah, I upgraded. [16:05] Peng_, try re-indexing the branch [16:09] Yeah, that fixed it. [16:09] Huh. [16:10] Oops, I didn't keep a backup of the bad indexes, if anyone was interested. [16:11] I have a b0rked index already [16:11] attached it to a bug [16:12] ok :) [16:13] Oh, LP is approaching 300,000 bugs. [16:13] yeah, seems software is REALLY buggy :p [16:15] OK, I just checked all of my other branches, and there weren't any more with broken indexes. Just the two. === kiko is now known as kiko-fud [16:29] beuno, I think the upload plugin is your genius invention? [16:29] emmajane, well, vila did most of the heavy lifting [16:30] * emmajane nods. [16:30] and, by heavy lifting, I mean code :) [16:30] hehehe [16:30] I just complained a lot [16:30] Do you know if there's a way to toggle between two different servers? [16:30] ah, interesting [16:30] well, why wouldn't you be able to? [16:30] it remembers the upload server-side [16:30] I upload to testing, and then when it's working I need to upload to the live server. [16:31] without having to put in the sftp:// nonsense again. [16:31] * emmajane is lazy. :) [16:31] ah, multiple locations [16:31] yeah [16:32] emmajane: you can use --remember for testing (since it's most often used) and look at the bookmarks plugin for your lazt fingers :0 [16:32] well, bzr, I *think*, has something to alias locations [16:32] that's it [16:32] bookmarks [16:32] see, vila is the real brains [16:32] vila, awesome, thanks. :) [16:32] beuno: hi :) [16:32] emmajane: happy to help (c) [16:32] hi vila! [16:34] emmajane: on the other hand, if you control the test server and have ssh access to it, why not install your working tree there and use sshfs if you need to access it from a remote workstation ? [16:34] vila, the test server is my dreamhost account. the live machine is a college mainframe superfancy machine. I'm very happy to not tie dreamhost to the college. [16:35] emmajane: ok [16:35] vila, I had to get Very Special Permission to even be allowed to connect to the college machine. :) [16:36] vila, in a normal world where deployments happened from testing to live, it would make sense to do what you suggested. :) [16:36] evrything that suits a user needs make sense :) [16:37] :) [16:41] hm. I have bookmarks installed, but the documentation is a little... vague. [16:42] will it just remember places that I've uploaded files to? Or do I need to enter the locations manually? [16:42] * beuno suspects manually === bac is now known as bac_afk [16:43] * emmajane reads the actual plugin python file to figure it out [16:44] beuno, let's pretend I wanted to actually add documentation for the plugins that I use (because if I can't figure it out, I'm sure there are others)... Where would I put this information? [16:45] Launchpad doesn't seem to have a place for project docs. [16:46] emmajane, branch the code, addd the docs, push the branch, file a merge proposal [16:46] I'll be happy to walk you through it [16:47] beuno, hrm. and then normal people would have to find it in the --help at the command line? [16:47] emmajane, well, what other way would there be? [16:47] beuno, I usually check the wiki, to be honest. :) [16:47] you can create a wiki page on bazaar-vcs.org [16:47] and make sure it's linked from the launchpad page [16:48] luks, none of the plugins seem to have documentation online... or am I just lucky in the ones I choose...? [16:48] http://bazaar-vcs.org/BzrPlugins <--- there's usually a terse description but that's about it. [16:48] emmajane: why not make something better than what other people do :) [16:48] hehe [16:49] luks, that I can handle. :) [16:49] Hrmmm. I'm curious. How would bzr-svn handle working with a svn repo if someone went and changed a log message in the repo history? [16:50] I mean, I'm guessing at the very least, you wouldn't see that new message in `bzr log`, but I'm hoping it wouldn't break interoperability. :p [16:50] emmajane: 'bzr help bookmark' for usage and I'm pretty sure it stores them in .bazaar.conf [16:51] * emmajane nods to vila [16:51] NfNitLoop: good question [16:51] the pluginname with and without the S still trips me up. [16:51] help bookmarks != help bookmark [16:52] help tags != help tag [16:52] emmajane: do they have a "See also:" at the bottom to link them? [16:52] help bookmarks doesn't say "see also: bookmark" [16:53] tags does, bookmarks doesn't. [16:53] emmajane: that can be fixed at least :-) [16:53] james_w, patches welcome? ;) [16:53] it's an easy one [16:53] "easy" [16:53] sounds like a good hour of procrastination... [16:53] I'm in! [16:54] hmm, though I'm not sure what "help bookmarks" displays [16:54] probably the module help, and I'm not sure if you can link from that [16:54] if not then a bug report on bzr is in order :-) [16:54] the relevant bit is: From: plugin "bookmarks" [16:54] See also: plugins/bookmarks [16:55] It's missing See also: bookmark [16:55] I think? [16:55] yeah [16:56] emmajane: did you *try* bzr help plugins/bookmarks ? :) [16:56] I think that the one that needs love :) [16:57] vila, it needs love, I agree. :) [16:57] and I see where to edit that... [16:57] great :) [16:57] it /seems/ as though it would be the same information though. How come plugins/* is different than just the plugin name? [16:58] hrm. [16:58] because the plugin name happens to be also a command name [16:58] actually. [16:59] help bzr bookmarks != help bzr bookmark != help bzr plugins/bookmarks [16:59] and help bzr plugins/bookmark is not found. [16:59] because there is no plugin "bookmark" [16:59] that's enough to confuse a person right there. [16:59] luks, correct. [17:00] is there a way to make bookmarks/bookmark relate to each other? [17:00]