Timestamps are in GMT/BST.
[0:01] * lopex (lopex@84-10-213-252.dynamic.chello.pl) Quit (Ping timeout: 240 seconds)
[0:02] * lopex (lopex@84-10-213-252.dynamic.chello.pl) has joined #jython
[0:10] * lopex (lopex@84-10-213-252.dynamic.chello.pl) Quit ()
[0:38] * akitada (~user@unaffiliated/akitada) Quit (Ping timeout: 276 seconds)
[0:45] * lopex (lopex@84-10-213-252.dynamic.chello.pl) has joined #jython
[0:56] * headius (~headius@71-210-144-217.mpls.qwest.net) Quit (Quit: headius)
[1:12] * oskarei (~oskarei@85-220-11-51.dsl.dynamic.simnet.is) has joined #jython
[1:32] * oskarei (~oskarei@85-220-11-51.dsl.dynamic.simnet.is) has left #jython
[1:43] * cschneid_ (~cschneid@c-76-120-122-74.hsd1.co.comcast.net) has joined #jython
[1:43] * cschneid (~cschneid@76.120.122.74) Quit (Read error: No route to host)
[2:16] * lopex (lopex@84-10-213-252.dynamic.chello.pl) Quit ()
[3:10] * pr3d4t0r (~cu4cu4@varenka.cime.net) Quit (Quit: WeeChat 0.2.6)
[3:15] * pr3d4t0r (~cu4cu4@varenka.cime.net) has joined #jython
[3:28] * juneau001 (~juneau@50.44.41.15) Quit (Quit: juneau001)
[6:09] * jabley (~jabley@cpc1-farn4-0-0-cust318.6-2.cable.virginmedia.com) has joined #jython
[6:59] * jabley (~jabley@cpc1-farn4-0-0-cust318.6-2.cable.virginmedia.com) Quit (Quit: jabley)
[7:05] * Torpeo is now known as zz_Torpeo
[7:20] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Read error: Connection reset by peer)
[7:24] * ohumbel (5390f2dc@gateway/web/freenode/ip.83.144.242.220) has joined #jython
[7:25] * kilon (~kilon@adsl-70.79.107.24.tellas.gr) has joined #jython
[7:46] * thobe (~Adium@212-162-171-110.skbbip.com) has joined #jython
[8:46] * jabley (~jabley@78-105-125-211.zone3.bethere.co.uk) has joined #jython
[9:06] * zz_Torpeo is now known as Torpeo
[9:09] * thekilon (~kilon@adsl-14.79.107.13.tellas.gr) has joined #jython
[9:12] * kilon (~kilon@adsl-70.79.107.24.tellas.gr) Quit (Ping timeout: 260 seconds)
[9:35] * Torpeo is now known as zz_Torpeo
[9:48] * zz_Torpeo is now known as Torpeo
[10:27] * lopex (531346b2@gateway/web/freenode/ip.83.19.70.178) has joined #jython
[11:07] * juneau001 (~juneau@131.225.24.148) has joined #jython
[12:34] * thekilon is now known as kilon
[12:36] * mrud (uli@grml/developer/mru) Quit (Read error: Operation timed out)
[12:44] * mrud (uli@grml/developer/mru) has joined #jython
[12:59] * agronholm (~demigod@nblzone-211-37.nblnetworks.fi) Quit (*.net *.split)
[13:06] * agronholm (~demigod@nblzone-211-37.nblnetworks.fi) has joined #jython
[13:14] <pr3d4t0r> Good morning.
[13:40] * akitada (~user@unaffiliated/akitada) has joined #jython
[13:53] * kilon (~kilon@adsl-14.79.107.13.tellas.gr) Quit (Quit: Leaving)
[14:08] * wmeissner (~wmeissner@123.200.245.62) has joined #jython
[14:12] * lopex (531346b2@gateway/web/freenode/ip.83.19.70.178) Quit ()
[14:32] * kilon (~kilon@adsl-14.79.107.13.tellas.gr) has joined #jython
[14:48] * shashank (~shashank@c-98-245-87-8.hsd1.co.comcast.net) has joined #jython
[15:28] * akitada (~user@unaffiliated/akitada) Quit (Ping timeout: 246 seconds)
[15:40] * Torpeo is now known as zz_Torpeo
[15:48] <fwierzbicki> pjenvey: sorry it's taken so long for me to test your hg work... I have a question: if I do "branch 2.5" should the svn part (CPythonLib) also update properly? I seem to have trouble with that.
[15:49] <fwierzbicki> pjenvey: and I don't think I've said this enough - I am so happy you are driving this!
[15:50] <fwierzbicki> oops got that command wrong - just a sec
[15:52] <fwierzbicki> pjenvey: http://pylonshq.com/pasties/cf1d2b43ad6c9fda22e96430d68c30dd
[15:52] <fwierzbicki> I meant "hg update 2.5" of course :)
[15:53] <fwierzbicki> I use too many DVCSs
[16:00] * kilon (~kilon@adsl-14.79.107.13.tellas.gr) Quit (Ping timeout: 276 seconds)
[16:06] * wmeissner (~wmeissner@123.200.245.62) Quit (Ping timeout: 250 seconds)
[16:27] * kilon (~kilon@adsl-14.79.107.13.tellas.gr) has joined #jython
[16:49] <fwierzbicki> so apparently I need to work on my hg skills as it looks like my attempt to add one word to a file resulted in 3 commits
[16:53] * thobe (~Adium@212-162-171-110.skbbip.com) Quit (Quit: Leaving.)
[16:59] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[17:03] <juneau001> fwierzbicki: just issue: hg commit -m 'message here' filename.ext , followed by: hg push ... that should perform a single commit
[17:03] <juneau001> well, a commit and push :)
[17:04] <fwierzbicki> juneau001: heh - I think my trouble is that I didn't do "hg update" first and fumbled the merge
[17:05] <juneau001> fwierzbicki: ah
[17:07] <juneau001> fwierzbicki: I live by this guide: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
[17:07] <fwierzbicki> juneau001, cool, I'll check it out for next time!
[17:07] <juneau001> I am sure you found that already, but just in case you have not it is helpful for reference
[17:10] * zz_Torpeo is now known as Torpeo
[17:10] * jabley (~jabley@78-105-125-211.zone3.bethere.co.uk) Quit (Quit: jabley)
[17:27] * kilon (~kilon@adsl-14.79.107.13.tellas.gr) Quit (Quit: Leaving)
[17:58] <pjenvey> fwierzbicki - sorry, uh
[17:58] <pjenvey> my last email somewhat mentioned that issue, it's an hg bug
[17:59] <pjenvey> so if the CPythonLib you're up'ing too differs from the current, hg barfs
[17:59] <fwierzbicki> pjenvey: ah cool, just making sure it wasn't my setup/limited understanding of hg
[17:59] <pjenvey> only way around it right now is to move CPythonLib out of the way and rm .hgsub*
[17:59] <fwierzbicki> pjenvey: ok, cool
[17:59] <pjenvey> in practice i'd recommend doing a hg clone the main the repo, and then cloning a separate repo for 2.5
[18:00] <pjenvey> hg clone http://etc/jython
[18:00] <pjenvey> then hg clone jython#2.5 jython-2.5
[18:00] <pjenvey> that second repo won't take up that much space, it'll be mostly hardlinks to start with
[18:00] <fwierzbicki> pjenvey: ok, sounds good, I'll give it a try.
[18:01] <pjenvey> ohumbel - still waiting to get your key added, i'll let you know when it happens
[18:03] <fwierzbicki> pjenvey: great, the clone method works just fine for me.
[18:04] <pjenvey> yea so say you have a bug fix that applies to 2.5. Make the change in the 2.5 repo first. Then when you do a 'push', it'll only go to your default repo
[18:04] <pjenvey> then you can merge it to default (or do a dummy merge if you dont want it on default)
[18:05] <pjenvey> then when you push from there, you'll push both at the same time
[18:05] <pjenvey> which is the way to do it, then nobody has to think about merging your stuff
[18:05] <pjenvey> (push both at the same time back to the main repo finally, I mean)
[18:07] <pjenvey> let me know if that doesn't make sense, i can elaborate
[18:09] <fwierzbicki> pjenvey: excellent - I think what you are saying is the same as the CPython hg guide right?
[18:09] <fwierzbicki> so if I need elaboration I could RTFM :)
[18:10] <fwierzbicki> well except they don't have the svn problem
[18:24] <pjenvey> yep
[18:42] * MarderIII (~marderii@enneman.demon.nl) has joined #jython
[18:43] * headius (~headius@70-89-202-123-invergrove-mn.hfc.comcastbusiness.net) has joined #jython
[19:19] * juneau001 (~juneau@131.225.24.148) Quit (Quit: juneau001)
[19:53] <pjenvey> but I don't mind elaborating on stuff at all if anyone has questions, we have enough trouble writing the diffs themselves, having trouble actually committing them can get really frustrating =]
[20:23] * MarderIII (~marderii@enneman.demon.nl) Quit (Quit: [IRSSI] Network error, Please reboot the universe.)
[21:03] * wmeissner (~wmeissner@119.12.198.154) has joined #jython
[21:38] * headius (~headius@70-89-202-123-invergrove-mn.hfc.comcastbusiness.net) Quit (Quit: headius)
[21:54] * jabley (~jabley@cpc1-farn4-0-0-cust318.6-2.cable.virginmedia.com) has joined #jython
[22:26] * lopex (lopex@84-10-213-252.dynamic.chello.pl) has joined #jython
[22:27] * jabley (~jabley@cpc1-farn4-0-0-cust318.6-2.cable.virginmedia.com) Quit (Quit: jabley)
[22:38] * fwierzbicki (~frank@99-106-170-105.lightspeed.sntcca.sbcglobal.net) Quit (Ping timeout: 250 seconds)
[22:49] * headius (~headius@206.144.57.145) has joined #jython
[23:45] * headius (~headius@206.144.57.145) Quit (Quit: headius)
These logs were automatically created by JythonLogBot_ on irc.freenode.net using a slightly modified version of the Java IRC LogBot (github).