Join us now at the IRC channel.
*oiaohm has quit (Remote host closed the connection) | Feb 13 00:42 | |
*gnufreex has quit (Remote host closed the connection) | Feb 13 01:14 | |
*trmanco (~trmanco@d72-39-88-249.home1.cgocable.net) has joined #boycottnovell-social | Feb 13 02:21 | |
*trmanco has quit (Changing host) | Feb 13 02:21 | |
*trmanco (~trmanco@unaffiliated/trmanco) has joined #boycottnovell-social | Feb 13 02:21 | |
qu1j0t3 | trmanco: hi | Feb 13 03:13 |
---|---|---|
qu1j0t3 | trmanco: got a 'crossed branches' msg from hg, and i'm more exp with svn | Feb 13 03:13 |
qu1j0t3 | trmanco: can u tell me easiest way to resolve? | Feb 13 03:13 |
trmanco | oh, so you are furnace boy | Feb 13 03:16 |
qu1j0t3 | indeed | Feb 13 03:16 |
trmanco | I'm sorry, but I can't help you with that | Feb 13 03:16 |
qu1j0t3 | oh okay. | Feb 13 03:16 |
trmanco | ask on their mailing lists | Feb 13 03:17 |
qu1j0t3 | i can work it out - just assumed you were an Hg guru and would know right away what to do:) | Feb 13 03:17 |
qu1j0t3 | nah, it's probably a common situation | Feb 13 03:17 |
qu1j0t3 | i was just being lazy | Feb 13 03:17 |
trmanco | nah, I haven't mastered any VCS yet | Feb 13 03:17 |
qu1j0t3 | i had a couple of little changes to phIRCe | Feb 13 03:17 |
qu1j0t3 | relating to a reddit weirdness | Feb 13 03:18 |
qu1j0t3 | maybe you've seen this: | Feb 13 03:18 |
qu1j0t3 | qu1j0t3 | http://reddit.com/fisfv | Feb 13 03:19 |
qu1j0t3 | phIRCe-6806 | Not a web page! Aborting type | Feb 13 03:19 |
TechrightsBot-sc | Not a web page! Aborting type | Feb 13 03:19 |
qu1j0t3 | hehe | Feb 13 03:19 |
qu1j0t3 | well, i know why that happens, and it's reddit's fault. | Feb 13 03:19 |
trmanco | stupid iframe :P | Feb 13 03:19 |
qu1j0t3 | worse. | Feb 13 03:19 |
trmanco | what the header? | Feb 13 03:19 |
trmanco | what's | Feb 13 03:19 |
qu1j0t3 | they omit the Content-Type | Feb 13 03:19 |
trmanco | hah | Feb 13 03:19 |
qu1j0t3 | on the final Location | Feb 13 03:19 |
qu1j0t3 | also, look at this: | Feb 13 03:20 |
trmanco | yeah, type -> black | Feb 13 03:20 |
trmanco | blank* | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | $ curl -I http://www.reddit.com/fisfv | Feb 13 03:20 |
TechrightsBot-sc | Title: FOX NEWS INSIDER: “Stuff Is Just Made Up” via reddit.com .::. Size~: 1.66 KB | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | HTTP/1.1 302 Moved Temporarily | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Content-Type: text/html; charset=UTF-8 | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Location: http://www.reddit.com/tb/fisfv | Feb 13 03:20 |
TechrightsBot-sc | Title: FOX NEWS INSIDER: “Stuff Is Just Made Up” via reddit.com .::. Size~: 1.66 KB | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Set-Cookie: reddit_first=%7B%22firsttime%22%3A%20%22first%22%7D; Domain=reddit.com; expires=Thu, 31 Dec | Feb 13 03:20 |
qu1j0t3 | 2037 23:59:59 GMT; Path=/ | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Server: '; DROP TABLE servertypes; -- | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Date: Sat, 12 Feb 2011 15:12:55 GMT | Feb 13 03:20 |
qu1j0t3 | qu1j0t3 | Connection: keep-alive | Feb 13 03:20 |
qu1j0t3 | yes. | Feb 13 03:20 |
qu1j0t3 | check the Server: header. haha | Feb 13 03:20 |
qu1j0t3 | i was wondering if that was a counter-hack of some sort. | Feb 13 03:20 |
trmanco | so, I'm hopping you got a fix? :P | Feb 13 03:21 |
qu1j0t3 | it seems that without content-type, the customary thing is to ignore the content. | Feb 13 03:22 |
qu1j0t3 | so i made it emit a more sensible message | Feb 13 03:22 |
qu1j0t3 | and not attempt to archive | Feb 13 03:22 |
qu1j0t3 | note that this works http://www.reddit.com/fisfv | Feb 13 03:22 |
trmanco | good, I don't think many people would link the reddit iframe link | Feb 13 03:22 |
TechrightsBot-sc | Title: FOX NEWS INSIDER: “Stuff Is Just Made Up” via reddit.com .::. Size~: 1.66 KB | Feb 13 03:22 |
trmanco | ? | Feb 13 03:23 |
qu1j0t3 | but this doesn't http://reddit.com/fisfv | Feb 13 03:23 |
TechrightsBot-sc | Not a web page! Aborting type | Feb 13 03:23 |
trmanco | hahaha | Feb 13 03:23 |
trmanco | www | Feb 13 03:23 |
qu1j0t3 | yes. | Feb 13 03:23 |
qu1j0t3 | but MinceR occasionally posts the latter type of link | Feb 13 03:23 |
trmanco | just hack around it, and append the WWW | Feb 13 03:23 |
qu1j0t3 | personally i wouldn't | Feb 13 03:23 |
qu1j0t3 | it's a reddit bug | Feb 13 03:23 |
qu1j0t3 | it may also happen with other sites | Feb 13 03:23 |
qu1j0t3 | well, you could special case, but there will be random others like this | Feb 13 03:24 |
trmanco | yes, good point | Feb 13 03:24 |
qu1j0t3 | but they won't work with some browsers either | Feb 13 03:24 |
qu1j0t3 | i'm happy to ignore the page if it lacks content-type | Feb 13 03:24 |
trmanco | maybe one of us should report this to reddit | Feb 13 03:24 |
trmanco | have them fix it :P | Feb 13 03:24 |
qu1j0t3 | yes, we should. lets flip a coin :D | Feb 13 03:24 |
trmanco | or maybe we can just hack on reddit's code and fix it our selves :P | Feb 13 03:25 |
qu1j0t3 | i think MinceR should | Feb 13 03:25 |
qu1j0t3 | since he's the only one who posts these links :D | Feb 13 03:25 |
*trmanco sees typo | Feb 13 03:25 | |
qu1j0t3 | trmanco: so what did you get up to this friday night | Feb 13 03:25 |
qu1j0t3 | we had a $100 (!!) meal | Feb 13 03:25 |
qu1j0t3 | luckily the restaurant decided to throw us a couple of free drinks to dull the pain | Feb 13 03:26 |
trmanco | hah | Feb 13 03:26 |
qu1j0t3 | i failed to realise their lamb special was $35 ! | Feb 13 03:26 |
trmanco | I just spent some time at home catching up on the news | Feb 13 03:26 |
qu1j0t3 | this is in a place where the Angus steak is say $24 | Feb 13 03:26 |
trmanco | what restaurant? | Feb 13 03:26 |
qu1j0t3 | Salto (italian), on cnr Davenport and Ossington | Feb 13 03:26 |
qu1j0t3 | in the portuguese area | Feb 13 03:27 |
qu1j0t3 | it's pretty reasonable priced most of the time, we had 2 drinks each tho | Feb 13 03:27 |
trmanco | ok | Feb 13 03:27 |
qu1j0t3 | adds up | Feb 13 03:27 |
qu1j0t3 | appetiser, dessert | Feb 13 03:27 |
trmanco | so yeah, I'm confused | Feb 13 03:27 |
qu1j0t3 | but normally i consider $80 an expensive meal | Feb 13 03:27 |
qu1j0t3 | hehe | Feb 13 03:27 |
trmanco | so are you Brazilian or Australian? | Feb 13 03:27 |
trmanco | $50 would be my limits | Feb 13 03:27 |
qu1j0t3 | i'm australian | Feb 13 03:27 |
qu1j0t3 | well this is for 2 people | Feb 13 03:28 |
trmanco | ah | Feb 13 03:28 |
qu1j0t3 | my wife is brazilian | Feb 13 03:28 |
trmanco | ahhh | Feb 13 03:28 |
qu1j0t3 | :) | Feb 13 03:28 |
trmanco | so that's why :) | Feb 13 03:28 |
qu1j0t3 | agora vc entende | Feb 13 03:28 |
qu1j0t3 | risos | Feb 13 03:28 |
trmanco | pois sim | Feb 13 03:28 |
qu1j0t3 | as vezes gosto de praticar o meu Pt | Feb 13 03:29 |
qu1j0t3 | :) | Feb 13 03:29 |
trmanco | estou a ver que a sua esposa e uma boa professora de portugues :P | Feb 13 03:29 |
qu1j0t3 | rs obrigado! | Feb 13 03:29 |
*trmanco volta ja | Feb 13 03:29 | |
qu1j0t3 | ela esta aqui ao meu lado | Feb 13 03:29 |
qu1j0t3 | ok | Feb 13 03:29 |
qu1j0t3 | we'll be going soon | Feb 13 03:29 |
qu1j0t3 | i'll deal with the Hg thing | Feb 13 03:29 |
*trmanco back | Feb 13 03:39 | |
trmanco | so qu1j0t3 you have that problem with phirce's repo? | Feb 13 03:39 |
qu1j0t3 | exactly | Feb 13 03:39 |
trmanco | or did you create a seperate branch locally, and now trying to merge with default? | Feb 13 03:40 |
qu1j0t3 | i just have to conceptualise what it's telling me. | Feb 13 03:40 |
qu1j0t3 | no, i just pulled, commit'd, pushed, made more changes, commit'd, and want to push again | Feb 13 03:40 |
trmanco | I see | Feb 13 03:40 |
qu1j0t3 | but something change dupstream | Feb 13 03:40 |
qu1j0t3 | ? | Feb 13 03:40 |
trmanco | yeah | Feb 13 03:40 |
trmanco | many changes | Feb 13 03:40 |
trmanco | other than changes I added a new tag | Feb 13 03:41 |
trmanco | but, no new branches | Feb 13 03:41 |
qu1j0t3 | hmm | Feb 13 03:41 |
qu1j0t3 | i guess i'll have another look in the morning | Feb 13 03:41 |
trmanco | have you tried hg update | Feb 13 03:43 |
trmanco | ? | Feb 13 03:43 |
qu1j0t3 | i tried pull | Feb 13 03:43 |
qu1j0t3 | let me see | Feb 13 03:43 |
qu1j0t3 | $ hg update | Feb 13 03:43 |
qu1j0t3 | abort: crosses branches (merge branches or use --clean to discard changes) | Feb 13 03:43 |
qu1j0t3 | so i need to 'merge branches' | Feb 13 03:43 |
trmanco | hmm... | Feb 13 03:44 |
trmanco | http://www.selenic.com/pipermail/mercurial/2009-August/027156.html | Feb 13 03:47 |
TechrightsBot-sc | Title: Update "crosses branches" .::. Size~: 3.32 KB | Feb 13 03:47 |
trmanco | found this | Feb 13 03:47 |
trmanco | might be relevant | Feb 13 03:47 |
trmanco | http://mercurial.selenic.com/wiki/TutorialMerge | Feb 13 03:49 |
TechrightsBot-sc | Title: TutorialMerge - Mercurial .::. Size~: 33.22 KB | Feb 13 03:49 |
trmanco | haha, scroll down | Feb 13 03:49 |
trmanco | http://mercurial.selenic.com/wiki/TutorialMerge#line-115 right here | Feb 13 03:51 |
TechrightsBot-sc | Title: TutorialMerge - Mercurial .::. Size~: 33.22 KB | Feb 13 03:51 |
qu1j0t3 | ok | Feb 13 03:51 |
qu1j0t3 | i'll read in the am | Feb 13 03:51 |
qu1j0t3 | thanks | Feb 13 03:51 |
qu1j0t3 | ! | Feb 13 03:51 |
trmanco | np | Feb 13 03:53 |
trmanco | http://www.reddit.com/tb/fkb2g | Feb 13 04:11 |
TechrightsBot-sc | Title: The Chrome browser does amazing things when it updates. (Can someone expand/explain this?) via reddit.com .::. Size~: 1.71 KB | Feb 13 04:11 |
*ender2070 (~ender2070@d72-38-0-183.commercial1.cgocable.net) has joined #boycottnovell-social | Feb 13 04:55 | |
*trmanco has quit (Quit: Leaving) | Feb 13 05:03 | |
schestowitz | https://twitter.com/yuhong2/status/36646253689450496 | Feb 13 05:48 |
TechrightsBot-sc | @yuhong2: @schestowitz Another Hacker News thread: http://news.ycombinator.com/item?id=2211086 | Feb 13 05:48 |
TechrightsBot-sc | -> Title: Hacker News | Nokia USA president is out, replaced by Microsoft vet Chris Weber .::. Size~: 25.21 KB | Feb 13 05:48 |
*abeNd-org has quit (Read error: Connection reset by peer) | Feb 13 05:59 | |
*gnufreex (~quassel@93-87-115-248.dynamic.isp.telekom.rs) has joined #boycottnovell-social | Feb 13 06:40 | |
*ender2070 has quit (Remote host closed the connection) | Feb 13 07:36 | |
*sebsebseb has quit (Ping timeout: 240 seconds) | Feb 13 08:35 | |
*oiaohm (~oiaohm@132.177-27-211.dynamic.dsl.brs.iprimus.net.au) has joined #boycottnovell-social | Feb 13 10:08 | |
*oiaohm has quit (Changing host) | Feb 13 10:08 | |
*oiaohm (~oiaohm@unaffiliated/oiaohm) has joined #boycottnovell-social | Feb 13 10:08 | |
schestowitz | qu1j0t3: this video is sickening http://www.youtube.com/watch?v=3Fab1IsCZzY | Feb 13 10:29 |
TechrightsBot-sc | Title: YouTube - The Assassination of Julian Assange .::. Size~: 129.84 KB | Feb 13 10:29 |
schestowitz | I've only just watched the whole thing. Good montage | Feb 13 10:29 |
*MinceR has quit (Ping timeout: 265 seconds) | Feb 13 12:22 | |
*MinceR (~mincer@unaffiliated/mincer) has joined #boycottnovell-social | Feb 13 12:23 | |
*j`ey is now known as jeyfk | Feb 13 13:38 | |
schestowitz | http://www.zdnet.com/blog/open-source/nokia-jumps-from-one-burning-platform-to-another-with-windows-phone-7/8271 | Feb 13 15:13 |
TechrightsBot-sc | Title: Nokia jumps from one burning platform to another with Windows Phone 7 | ZDNet .::. Size~: 133.28 KB | Feb 13 15:13 |
*oiaohm has quit (Read error: Connection reset by peer) | Feb 13 15:41 | |
schestowitz | http://www.washingtonpost.com/wp-dyn/content/article/2011/02/08/AR2011020806345.html | Feb 13 17:28 |
TechrightsBot-sc | Title: Patriot Act extension fails in the House by seven votes .::. Size~: 103.04 KB | Feb 13 17:28 |
schestowitz | qu1j0t3: did you see http://www.cnbc.com/id/41257962 ? | Feb 13 17:28 |
TechrightsBot-sc | Title: UBS Whistleblower Finds Himself in Federal Prison - CNBC .::. Size~: 152.59 KB | Feb 13 17:28 |
qu1j0t3 | i saw the headlines, tweeted it | Feb 13 17:29 |
schestowitz | http://www.counterpunch.org/thompson02112011.html | Feb 13 17:47 |
TechrightsBot-sc | Title: Brad Thompson: The Domestic War on Protesters .::. Size~: 184.6 KB | Feb 13 17:47 |
*abeNd-org (~KKlenke@198.215.34.14) has joined #boycottnovell-social | Feb 13 19:28 | |
*jeyfk is now known as j`ey | Feb 13 19:52 | |
abeNd-org | http://ars.userfriendly.org/cartoons/?id=20110213 classic | Feb 13 20:02 |
TechrightsBot-sc | Title: UserFriendly Strip Comments .::. Size~: 38.62 KB | Feb 13 20:02 |
*BobJonkman (~BobJonkma@206-248-137-186.dsl.teksavvy.com) has joined #boycottnovell-social | Feb 13 20:20 | |
qu1j0t3 | schestowitz: http://mobile.slashdot.org/story/11/02/13/1751258/Why-Nokia-Is-Toast | Feb 13 20:26 |
TechrightsBot-sc | Title: Why Nokia Is Toast - Slashdot .::. Size~: 131.18 KB | Feb 13 20:26 |
*BobJonkman has quit (Quit: Leaving.) | Feb 13 20:31 | |
*gnufreex has quit (Remote host closed the connection) | Feb 13 21:23 | |
schestowitz | Toast. Yummy... | Feb 13 21:44 |
*Ender2070 (~Brandon@d72-38-0-183.commercial1.cgocable.net) has joined #boycottnovell-social | Feb 13 22:04 | |
schestowitz | Since this morning we've had some apparent cache problem in TR, The root http://techrights.org/ address is sometimes not accessible, sometimes gives the Varnish "Error 503 Service Unavailable", sometimes blank pages, and sometimes it works fine. What's interesting is that all other pages work just perfectly. | Feb 13 22:25 |
TechrightsBot-sc | @: | Feb 13 22:25 |
*abeNd-org has quit (Read error: Connection reset by peer) | Feb 13 22:51 | |
qu1j0t3 | schestowitz: you'll love this http://twitter.com/#!/newsycombinator/status/36922580757643266 | Feb 13 23:15 |
TechrightsBot-sc | @newsycombinator: HD 555 to HD 595 mod (or: how Sennheiser cripples cheaper headphones) http://j.mp/fEfeG8 | Feb 13 23:15 |
TechrightsBot-sc | -> Title: Sennheiser HD 555 to HD 595 Mod – mike beauchamp .::. Size~: 8.15 KB | Feb 13 23:15 |
schestowitz | Added | Feb 13 23:20 |
*sebsebseb (~3seb@unaffiliated/sebsebseb) has joined #boycottnovell-social | Feb 13 23:51 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!