#jython IRC Log

Index

IRC Log for 2014-05-05

Timestamps are in GMT/BST.

[0:29] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[1:03] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Ping timeout: 252 seconds)
[1:09] * chrisseaton (~chrisseat@79-76-250-126.dynamic.dsl.as9105.com) Quit ()
[1:10] * chrisseaton (~chrisseat@79-76-250-126.dynamic.dsl.as9105.com) has joined #jython
[2:23] * chrisseaton (~chrisseat@79-76-250-126.dynamic.dsl.as9105.com) Quit ()
[7:21] * oscar_toro (~Thunderbi@80-62-162-242-static.dk.customer.tdc.net) has joined #jython
[7:30] * oscar_toro (~Thunderbi@80-62-162-242-static.dk.customer.tdc.net) Quit (Ping timeout: 252 seconds)
[10:26] * oscar_toro (~Thunderbi@80-62-162-242-static.dk.customer.tdc.net) has joined #jython
[12:21] * zz_whg is now known as whg
[13:27] * sinistersnare (~sinisters@pool-72-83-3-218.washdc.fios.verizon.net) has joined #jython
[13:35] * enebo (~enebo@c-75-73-8-169.hsd1.mn.comcast.net) has joined #jython
[14:55] * chrisseaton (~chrisseat@79-76-241-231.dynamic.dsl.as9105.com) has joined #jython
[17:07] <jimbaker> agronholm, i know you are a rebase fan. quick question then: if i want to pull jython-socket-reboot into trunk, i'm assuming something like the following
[17:07] <jimbaker> hg pull --rebase ssh://hg@bitbucket.org/jimbaker/jython-socket-reboot
[17:08] <jimbaker> but this is keeping my approx 140 commits around in the log. anyway to just get "Merge bitbucket branch of jython-socket-reboot" (the last commit message)?
[17:08] <agronholm> I've mostly migrated away from mercurial by now
[17:09] <agronholm> but usually you want a merge in such a situation
[17:09] <agronholm> assuming both branches have a large number of commits since the separation
[17:11] <agronholm> jimbaker: hm, the --collapse option might do it
[17:11] <agronholm> worth a try
[17:11] <jimbaker> agronholm, collapse looks good, i just didn't find a good example addressing my situation
[17:13] <jimbaker> re large number of commits since separation - i have constantly pulled changes from trunk to prevent divergence. but it's a pretty simple history imho. anyway, as i understand rebase, i will get the branch merged as if it were a patch against tip, which sounds reasonable to me
[17:14] <jimbaker> if i cannot readily get a single commit message, that's ok as well. we are not really too worried about minimal commit histories in jython
[17:14] <jimbaker> but best to keep history of course
[17:18] <agronholm> oh
[17:18] <agronholm> hm
[17:18] <agronholm> a rebase might actually be good then
[17:18] <agronholm> so, do you have everything you need?
[18:05] * chrisseaton (~chrisseat@79-76-241-231.dynamic.dsl.as9105.com) Quit (Ping timeout: 252 seconds)
[18:24] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[18:37] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Max SendQ exceeded)
[18:37] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[18:50] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Max SendQ exceeded)
[18:51] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[19:04] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Max SendQ exceeded)
[19:04] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[19:17] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Max SendQ exceeded)
[19:18] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[19:27] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Ping timeout: 240 seconds)
[20:01] * oscar_toro (~Thunderbi@80-62-162-242-static.dk.customer.tdc.net) Quit (Ping timeout: 240 seconds)
[21:47] <jimbaker> agronholm, i haven't figured out the rebase. will look one more time however
[21:55] * whg is now known as zz_whg
[22:03] * robbyoconnor (~wakawaka@guifications/user/r0bby) has joined #jython
[22:48] * enebo (~enebo@c-75-73-8-169.hsd1.mn.comcast.net) Quit (Quit: enebo)
[22:52] <agronholm> jimbaker: not sure what the problem is...did rebase with --collapse not work?
[23:07] <jimbaker> more along the lines of, i need to figure out how to use --collapse
[23:08] <jimbaker> it's not immediately obvious
[23:19] * r0bby (~wakawaka@guifications/user/r0bby) has joined #jython
[23:19] * robbyoconnor (~wakawaka@guifications/user/r0bby) Quit (Quit: Konversation terminated!)
[23:32] * r0bby (~wakawaka@guifications/user/r0bby) Quit (Ping timeout: 276 seconds)

Index

These logs were automatically created by JythonLogBot on irc.freenode.net using a slightly modified version of the Java IRC LogBot.