[00:37] jam: nice [01:34] otfl [01:34] meh [01:36] lifeless: where are we at with the pqm shiny? can I mark that RT as complete? Or we're still testing? [01:37] we rolled back last night [01:37] I'm stabbing with a BIG KNIFE [01:37] unfuckingbelievable where this was at [01:46] wow, that bad eh? [02:02] yes [02:02] stdout and stderr are different fd's *for a reason* [02:06] oh my. :-) [02:51] Can anybody give me a hand with fixing history? [02:51] dmuir: elaborate :-) [02:52] Basically, I have several revisions where files were deleted/added instead of moved, and I'd like to fix that. [02:54] Is there some way I can create a branch up to the offending revision, fix it, then play back the other changes on top? [02:54] fix, from the point of view of making the actual old revisions look different, or fix, from the point of view of just stopping it causing a problem with future merging? [02:54] would be nice to fix so the old revision looks different, but primarily because it causes problems with merging. [02:55] Whichever is easiest :-) [02:55] rewriting history is awkward. sorting future merging is easier [02:55] ok [02:55] say the offending revno is 20 [02:56] bzr branch -r 19 trunk fix_moves [02:56] cd fix_moves [02:56] do I then do: [02:56] bzr merge -c 20 ../trunk [02:56] ? [02:57] and then fix the problems? Or is there a better way? [02:58] the problem with the above is merging back into trunk is a pain with fixing all the conflicts... [02:58] * maxb ponders [02:59] I've only ever fixed this sort of thing by carefully rearranging things *while* in the middle of doing a merge that generated contents conflicts [03:00] ah, ok. Yeah, a bunch of these are old revisions that are now causing problems... [03:01] and the conflicts are really hard to figure out... [03:02] Hello? Anyone not AFK here? I sheepishly approach, with a n00b question 0:-) [03:03] zearing: ask away [03:03] err, sorry, zearin [03:03] lol np [03:04] K, so…2 computers. House WiFi. I have a Bzr branch on my desktop I want to access on my laptop. I am embarrassed to admit that I found this to be waaaaay harder than I expected :D [03:04] OS? [03:05] Both computers are Macs on OSX 10.6, latest version of Bazaar, and I have discovered the joy of Bazaar Explorer [03:05] hmm... can you set up a shared folder? [03:05] Oh yeah, I do sharing all the time [03:06] Does OS X run a ssh server by default? [03:06] If so, that'll be a good way to do it [03:06] I'm just clumsy and novice when it comes to networking and URLs that aren't Web-ish [03:06] I have successfully SSHed into my Desktop from this machine, but I want to be able to do it in Bazaar Explorer [03:07] bzr+ssh://othermachine/path/to/branch :-) [03:07] (Also, I think I want to make it a "bound" branch so both stay in sync…that is correct, right?) [03:07] oh! :) [03:07] No username@machine/path/etc/etc ? [03:07] (with the protocol prefix I forgot to type?) [03:08] (gonna try it out right now…) [03:08] You can stick a username@ in before the machine name if your username is different on one end of the connection to the other [03:08] no, same username. [03:08] no need, then [03:08] 'bound' means 'when I commit, make sure it happens both remotely and locally' [03:09] And—I feel stupid asking as I'm pretty sure the answer is "yes", but—this is a URL, so I should choose "Open URL" instead of "Open" in Bazaar Explorer right? [03:09] uh, possibly. I'm a command-line person [03:09] no idea :-) [03:09] :) [03:09] I have full respect and reverence for the CLI [03:10] But I have a visual brain and I forget commands repeatedly unless I can see them as a button :) [03:10] Hehe [03:10] Thanks…gonna give this a shot, but I wanna say this was great support—you guys (and gals?) rock! [03:12] maxb: I've got another problem too... I have some cases where some stuff was added to both a trunk and staging branch, independently. When I try to merge between the two, conflicts galore... any "quick" way to solve? [03:12] um. not 'quick' [03:12] bummer :-) [03:13] The only way I know is to actually merge, get the conflicts, and then make sure you sort them out the right way such that you never need to do it again [03:13] Gah. No luck with bzr+ssh: "Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist." :( [03:13] Guess I'm off to launchpad :) [03:14] zearin: That'll work too... the other alternative would be to set up a share, and put the branch there. You should then be able to access it via the file system. [03:14] under /Volumes/ ? [03:14] zearin: there's probably an error from SSH just before that line that may be relevant [03:15] I tried the SSH in the OSX Terminal and it worked fine [03:15] maybe a password issue? [03:15] well correction…I tried a plain SSH to my other machine in the Terminal, and it worked fine [03:15] I didn't test the bzr+ssh on the CLI [03:16] maxb: what's the "right way"TM to merge so I never need to to do it again? :-) [03:18] zearin: I've found that by using ssh keys, you're much less likely to have issues when using bzr+ssh. [03:19] Hm okay…again, this is something I have fiddled with. Barely. But I don't really know what I'm doing with keys. I have a GUI app to help me manage them (don't laugh! :P) [03:19] last time I tried using bzr over a protocol requiring authentication, it would crap out if asked for a password. [03:20] that seems to be what is happening [03:20] I tried it in terminal and after I gave the password it died [03:20] bzr doesn't have the ability to do ssh passwords - ssh grabs the terminal entirely itself. [03:21] so if you're using ssh (and lp: ends up using ssh), you have to use an agent that can prompt you, or hold the keys open for you [03:21] define "grabs the terminal entirely" ? [03:21] okay [03:21] zearin: tutorial for setting up ssh keys: http://wiki.dreamhost.com/Ssh#Passwordless_Login [03:22] I have one already set up [03:22] I set it up for LP [03:22] I just don't know how to use it otherwise :) [03:22] zearin: my point is that the "Connection close: Unexpected end of message..." error is usually not the whole error. There's often some more output just before that that indicates why the connection failed. [03:22] Okay spiv … onesec [03:23] Tonys-MacBook:~ tony$ bzr branch bzr+ssh://Tonys-iMac.local/Developer/Projects/org.lyris [03:23] Unable to load plugin 'rebase'. It requested API version (2, 1, 0) of module but the minimum exported version is (2, 2, 0), and the maximum is (2, 2, 0) [03:23] Password: [03:23] bash: bzr: command not found [03:23] bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist. [03:23] That "rebase" error always occurs [03:24] But I've never used the rebase command, and other operations seem unaffected, so I ignore it. It can't be connected to the SSH issue, can it? [03:24] zearin: 'command not found' - you don't have bzr installed on your server. [03:24] I do, though [03:24] zearin: iYou need to add the same key you added to LP to your other mac, and you'll be able to log in to it without a password. [03:24] OOooh [03:25] both the identity & identity_rsa ? [03:25] zearin: is it in your path ? [03:25] zearin: try "ssh Tonys-iMac.local bzr help", I think you'll see that fail too [03:25] zearin: do this: "ssh Tonys-iMac.local bzr help" [03:25] spiv: \o/ [03:26] it did fail. WTF? I know I have bzr on my Desktop because I've already used it there! [03:26] Yes, when you log in directly, but it might not be on the path for ssh. [03:27] Well I also tried bzr+ssh://Tonys-iMac.local/~/rest/of/path , which according to the Documentation should unambiguously start me at the home dir [03:27] with same results. :( [03:28] zearin: When you connect via ssh, it typically uses a different profile. [03:29] okay, so I just did this: [03:29] Tonys-MacBook:~ tony$ ssh Tonys-iMac.local [03:29] Password: [03:29] Last login: Wed Jun 9 22:11:37 2010 from tonys-macbook.local [03:29] -bash: /Users/tony/.bashrc: No such file or directory [03:29] Tonys-iMac:~ tony$ bzr [03:29] Bazaar 2.1.2 -- a free distributed version-control tool [03:29] http://bazaar-vcs.org/ [03:29] … [03:29] … [03:29] … [03:29] I am so beyond confused. :( [03:29] you're setting the path to bzr in your bash_profile, not your bashrc, or vice verca [03:29] I can never remember which is which :) [03:30] Neither can any of Google's search results :) [03:30] or you may have it beyond an interactive-only guard in bashrc [03:30] or something like that [03:30] Tonys-iMac:~ tony$ which bzr [03:31] /usr/local/bin/bzr [03:32] lifeless: I'm not sure that execing a command via ssh will run your bashrc (or whatever your shell of choice is) at all? [03:32] I'm not sure what you mean… :( [03:33] Tonys-iMac:~ tony$ cat .bash_profile [03:33] . ~/.bashrc [03:33] # Setting PATH for MacPython 2.6 [03:33] # The orginal version is saved in .bash_profile.pysave [03:33] PATH="/Library/Frameworks/Python.framework/Versions/2.6/bin:${PATH}" [03:33] export PATH [03:33] # Aliases [03:33] # [03:33] # @TODO - use "-G" and customize color outputs [03:33] alias ls="ls -aehAF" [03:33] Does that help? [03:33] .bashrc is used for non-login shells [03:33] zearin: (please use a pastebin) [03:33] How do I use a pastebin? [03:33] spiv: zearin put the PATH version in .bashrc [03:33] bah [03:33] zearin: ^ [03:34] spm: ready for some monkey love? [03:34] … [03:34] lifeless: perhaps not literally [03:34] *innocent look* [03:34] spm - please pull lp:~lifeless/pqm/attachments into pqm, after grabbing the current revision-info [03:34] I prefer my girlfriend :) She's much nicer than a monkey [03:34] hookay [03:34] ok... this is getting weird... back to work... [03:35] zearin: you need to set PATH in your .bashrc [03:35] Okay [03:35] Can I be lazy and just…cp .bash_profile .bashrc? [03:35] no [03:35] Damn. [03:36] spiv: I wonder if thats the macosx installer's fault? [03:36] lifeless: hmm, possibly [03:36] :(* [03:36] :*( [03:36] lifeless: 232 robertc@robertcollins.net-20100422043204-70jn37kx2whdm8fr [03:36] lifeless: worth asking someone that knows, at least :) [03:36] spiv: will you file the bug, or should I? [03:37] lifeless: Now on revision 252. u1 and ls are disabled for now; bzr is not [03:37] spm: and do 'python -c "import bzrlib.tests"' just to check [03:37] lifeless: please do, if you don't mind. [03:37] worked [03:37] spm: thanks [03:37] * spm waves heyo to spiv-the-dad [03:38] zearin: how did you install bzr ? [03:38] Mac installer. [03:38] spm: hey :) [03:40] lifeless: I installed it from the command line before, but I could never get Bazaar Explorer to install and work when I did that. I tried installing all the dependencies from scratch and went through tons of grief in a long Launchpad troubleshooting dialogue. Finally a new Mac installer came out, and I used it, and Bazaar Explorer worked. I was ecstatic. :) [03:40] lifeless: Both machines are using bzr from the Mac Installer now. [03:44] All I want is to sync two machines in my house. :( Why do I fail? [03:45] zearin: make the change spiv recommended [03:47] trying… [03:49] Gah [03:49] I'm too clumsy at this stuff :( And tired. I gotta go sleep. [03:50] But you were really supportive and I totally appreciate that! lifeless, spiv, dmuir, anybody else I forgot—thanks. I'll try again soon. ;) [03:50] Good night all, and may your commands complete execution flawlessly! [04:46] maxb: thanks for the help. I've been able to fix the conflicts and now merging works again :-) [05:01] spm: again please [05:01] dmuir: cool [05:03] lifeless: Now on revision 253. [05:03] spm: thanks [05:04] that was from lp:~lifeless/pqm/attachments again, to verify for you [05:09] yes [05:09] hi lifeless [05:10] can we talk about pqm some time? [05:10] poolie: sure [05:10] now is good [05:10] me too [06:06] hi lifeless, i'm back if you want to talk about fixtures [06:25] please ring me [06:25] poolie: ^ [06:35] bzr 2.1.1 on lucid. if i do 'bzr merge /other/branch/' i get 'bzr: ERROR: Working tree has uncommitted changes (See bzr status).' but 'bzr status' says nothing. whats going on? [06:36] m3ga: that's strange [06:36] hey spiv. yes, strange indeed [06:37] m3ga: I suppose that might happen if you had aliased bzr status to actually do "bzr status ." and your cwd isn't the project root... [06:37] nope, thats not it [06:38] Yeah, that did seem a bit far-fetched. [06:38] is just did 'bzr revert' and it removed a couple of files. [06:38] Hmm, then 'bzr status' should have reported something before the revert. [06:38] i agree :-) [06:39] and now it thinks there is no common ancestor [06:39] Or perhaps 'bzr --no-plugins --no-aliases status' should have ;) [06:39] thay may in fact not have a common ancestor. [06:40] Yeah, that message is generally right :) [06:40] yep, no common ancestor [06:41] thanks spiv [07:33] spm: hi [07:33] lifeless: I'd thought you'd forgotten about me.... [07:33] no [07:33] :-) [07:33] sadly python 2.x sucks [07:33] and something is upcasting things to unicode [07:33] switch to VisualBasic, make all our probvlems go away [07:34] so it only shows up in prod :( [07:35] excellent [07:36] spmdo? [07:39] sec [07:39] managed to reproduce locally [07:39] via the magic of paranoia [07:39] :-) [07:40] lifeless: just for the moment: http://www.youtube.com/watch?v=rpRiSb_Ir-s [07:45] hi all [07:45] hey vila [07:46] spm: spmdo, 254 incoming [07:48] lifeless: 254 from lp:~lifeless/pqm/attachments pulled in [07:52] spm: nice song [07:53] lifeless: you've not come across Garbage before? havea few of their cd's. not too shabby. [07:53] oh, I have cd's :) [07:53] doesn't stop it being a nice song [07:56] heh [07:57] I got into garbage at uni [07:58] -not to be quoting thast- [08:13] struggling to remember who I was listening to at Uni. zztop, pink floyd, queen, icehouse for a local band - live at expo '88 - awesomeness; /me quickly checks his record (yes record) collection, gets embarrassed and stops describing right there. [08:15] spm: yeah, better stop there or you will look even older than me :) (There was a Status Quo appearance near Strasbourg a couple of weeks ago and that's how I learned that they weren't dead after all :) [08:17] vila: you'll be pleased to know we've been educated our 7yo with Status Quo, (and Slade etc) which he tends to sing very loudly. I only hope it's a few more years before he discovers the meaning of some of those lyrics... :-D [08:18] hehe [08:19] * vila takes note to listen to the lyrics again now that his english has hopefully improved enough to understand ;) [08:19] 'the wanderer' is a classic that way [08:22] lifeless: how are we going with pqm? safe to open for U1 et al yet? or keep it wrapped? [08:22] waiting on spivs job [08:22] then my test one will go through [08:22] so - 1.3 hours prob [08:22] I'll liase with mthaddon [08:23] lifeless: what is up with pqm ? [08:23] * lifeless needs to send mail [08:23] trying to fix the terrible output people were getting [08:24] for value of terrible including None ? [08:24] no [08:24] truncated subunit stuff [08:25] filtered, no cause of error show, stdout+stderr conflated [08:25] lifeless: oki, I'll make sure the R Tis updated with the deatils of where we're at [08:25] thanks [08:26] lifeless: oooh, the one poolie mentioned, great, I think babune encountered it from time to time but I thought it was due to something else, since it was sporadic I had no way to diagnose, so any fix there will be warmly welcome [08:26] lifeless: so you're fixing subunit or pqm ? [08:26] vila: morning, how was your trip home? [08:26] hi there spiv, vila, mwhudson, lifeless [08:26] vila: pqm [08:27] hey mwhudson [08:27] lifeless, do you know off hand a good incantation to run a unittest from the interpreter [08:27] or more particularly from a doctest [08:27] mwhudson: I missed a train in Cambridge, got the next one (luckily 20 mins later), had on horrible trip between London and Paris due to 6 guys playing cards, drinking beer and laughing louder than you can imagine, but I arrived safely in the end :) [08:28] vila: :/ [08:28] vila: arriving safe is the main point i guess [08:28] and the worst thing... they work for us :/ [08:28] ;-) [08:28] mwhudson: I managed to fix two bugs related to BZR_PLUGINS_AT. Since I couldn't fight the guys, I throw my anger at the bugs :) [08:30] poolie: hehe, no way, we have some guys who drink but they manage to make *us* laugh instead :) [08:31] s/some/one/ [08:31] :-) [08:31] mwhudson: well, protecting the innocent(s) requires some blurry references :) [08:32] one guy who drinks? i think you need to pay more attention :) [08:34] there is drinking.... and then there is... drinking... [08:35] poolie: testscenarios has a doctest demo doing that [08:35] poolie: already fixed up to not chat to stdout/stderr [08:35] ok thanks [08:35] you may recognize it still :) [08:36] I drink only water and I'm not responsible for what is added there by barmaids as long that it's less than say 20% of the total :) [08:36] :) [09:15] I hate python2 [09:17] :-( [09:17] i like java :+) [09:17] btw lifeless, if i have changes in my files, and bzr know about that modified: [09:17] ChangeLog [09:17] src/cv_paintbrush_tool.c [09:18] why he still dosnt want to update... has uncommitted changes (See bzr status). Use --no-strict to force the push. [09:46] netshine: newer bzr doesn't do that, it says '--strict to prevent' [09:46] netshine: but are you pushing, or updating ? they are different things [09:48] thats ok fixed that. i was needed to mark the changes. === radoe_ is now known as radoe === lifeless_ is now known as lifeless [14:10] I have clearly gone mad [14:10] apparently left this branch in a completely broken state on the last commit [14:11] syntax errors and everything [14:11] this last bug is at least in codecs.open rather than my code [14:33] hey mgz [14:34] hey Alexander, just read the mail about a branch you want me to review [14:35] privet sacha, hi mgz [14:36] vila has been practicing his russian? or is very interested in hedges. [14:36] mgz: can jython use ctypes ? [14:36] mgz: Either way, he's branching out 8-} [14:37] One more joke going over my head :-/ [14:37] fullermd: _o/ [14:37] vila: not currently, but there is com.sun.jna [14:37] * fullermd buys vila a very tall hat. [14:38] I hate hats (sounds funny :) [14:38] http://www.hedging.co.uk/acatalog/pics_10273.html [14:39] mgz: hehe, so, bialix told me privet is the closest to hello indeed ;) [14:42] what? [14:43] why are hedges? [14:44] I was just making a little joke, bialix :) [14:45] ali g? [14:45] I don't want a chicken [14:46] bonjour vila [14:46] :-P [15:02] bialix: lp:~jspashett/bzr/587868_args_handling_cant_debug looks sensible to me, could do with some tests though [15:03] yep, I think it's possible to write tests here by replacing sys.argv with some value and then back [15:03] can you add such comment? I'm not sure is Jason will be able to write such tests though [15:05] no problem. [15:11] nice Bug 592083 [15:11] Launchpad bug 592083 in Bazaar "UnicodeDecodeError in get_password if user name is unicode (affected: 1, heat: 6)" [High,Confirmed] https://launchpad.net/bugs/592083 [15:12] there are several nasty bugs when user name is non ascii, or have a space inside. [15:12] I know, but never got enough time to fix :-/ [15:12] yeah, the space inside one bugged me for agest [15:13] but removing the default userid stuff last month was good enough for me [15:13] it's not enough [15:13] and that bug show === TheLyle is now known as IslandUsurper [16:06] vila: are you still around? [16:06] jam: hellloooo jam, yes [16:12] parthm... isn't in the channel... === IslandUsurper is now known as IslandUsurperAFK === beuno is now known as beuno-lunch [17:41] jam: ping [17:52] hi parthm [17:52] jam: hi [17:53] jam: i was looking into the "Will continue to try.." message. removing it totally seems good to me. [17:54] jam: if the timeout is always 0 i can also remove the code for it. do you know if "poll" is bzrlib.lockdir.wait_lock is used or is that also always 0? [17:55] parthm: the timeout is not 0 locally [17:55] just for the smart server [17:56] jam: ok. in that case i suppose i will just put the message in a conditional for time > 0 [17:56] s/time/timeout/ === IslandUsurperAFK is now known as IslandUsurper [17:57] jam: thanks for the clarification. i will update the mp for this. === beuno-lunch is now known as beuno [18:17] okay, let's finish this off, building py3k now. [18:19] mgz: did you port bzr to python 3? [18:19] ha, no, need to finish getting it working on less exotic pythons first [18:20] I need to check that my testtools change doesn't break py3k though. [18:38] okay, this is going to be a problem [18:38] looks like testtools has been written to be source-compatible with py3k [18:39] don't see how I can easily maintain that and actually test things related to unicode [18:41] wonder if they'd take a patch that ran 2to3 in setup.py instead [18:50] though, does appear to be broken on py3k currently anyway [19:34] okay, back to work [19:35] why I hate DocTestMatches - what the hell is the mismatch here: [19:35] http://paste.ubuntu.com/447885/ [19:46] okay, got it. [19:47] py3k removes the word "integer" from the exception message raised by `1/0` which means there's one too many spaces between the dots [20:22] anybody know how to get loggerhead to serve up robots.txt? [20:23] spiders suck, but at least some of them play by the rules [20:31] why should that be loggerhead's job? or are you using it without any kind of front end webserver? [20:35] morning [20:38] morning lifeless [20:39] mgz: it is running proxied behind apache [20:39] so, get apache to serve up robots.txt then. [20:39] but the "top level" for the domain is the loggerhead server [20:40] Alias robots.txt /path/to/robots.txt # or something [20:41] hm... my conf uses AliasMatch ^/robots.txt$ - but can't remember if I had a reason or was just being anal [20:42] mgz: can you post the whole line? [20:43] well, what I have to hand is: [20:43] AliasMatch ^/robots.txt$ "C:/Program Files/Apache2/htdocs/robots.txt" [20:44] I remember why I wrote it like that now, means paths like /robots.txt/extra/junk won't be translated [20:46] hmm [20:46] that doesn't seem to do it in my case [20:47] what mechanism are you using to forward requests to the (I presume) seperate loggerhead server? [21:00] mod_rewrite [21:00] I have a working rewrite rule now [21:01] ugh, could also be called mod_misuse [21:01] mgz: I've been using it to front Zope for more than a decade [21:02] bet you could do exactly what you are already with shorter, more readable config and just straight mod_proxy [21:02] nope [21:02] for some reason people treat mod_rewrite as a front end to everything else [21:02] I really do need to rewrite the URLs to get virtual hosting working [21:03] anyway, glad it's working. [21:03] it uses mod_proxy on the backend [21:03] thanks [21:03] I still think that loggerhead should be able to serve static files trivially [21:04] I think that might be nice [21:11] lifeless: howdy! you find a house yet? [21:12] http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=40+Rowse+Street,+Rangiora,+Canterbury,+New+Zealand&sll=-43.561088,172.721778&sspn=0.007961,0.017767&ie=UTF8&hq=&hnear=40+Rowse+St,+Rangiora+7400,+New+Zealand&ll=-43.316451,172.586439&spn=0.007993,0.017767&z=16&layer=c&cbll=-43.316371,172.586489&panoid=QOxqEX79iOaIyNEKwDze-A&cbp=12,283.41,,0,12.7 [21:13] we've put an offer in on it [21:13] cool [21:15] good luck [21:17] we lost a bidding war when I was looking 10 years ago [21:17] :( [21:18] turned out the place would've sucked -- the one we got is better (and cheaper) [21:18] :) [21:18] they have accepted out offer [21:18]