20120717T011046: *: <== :GitHub1!~GitHub1@sh2.rs.github.com NOTICE #fiji-devel :[fiji] dscho force-pushed updater from 0311eca to cc6fd92: http://git.io/ygYjIg 20120717T011046: *: <== :GitHub1!~GitHub1@sh2.rs.github.com NOTICE #fiji-devel :[fiji/updater] Updater: add some functions to access the ImageJ Updater - Johannes Schindelin 20120717T011046: *: <== :GitHub1!~GitHub1@sh2.rs.github.com NOTICE #fiji-devel :[fiji/updater] Updater: add more functions to access the ImageJ Updater - Johannes Schindelin 20120717T011046: *: <== :GitHub1!~GitHub1@sh2.rs.github.com NOTICE #fiji-devel :[fiji/updater] Special-case the first ImageJ Updater run - Johannes Schindelin 20120717T062005: *: <== :joshmoore!~joshmoore@manz-590efd53.pool.mediaWays.net JOIN #fiji-devel 20120717T062030: *: <== :GitHub39!~GitHub39@sh3.rs.github.com NOTICE #fiji-devel :[fiji] dscho force-pushed updater from cc6fd92 to aa4d0a9: http://git.io/ygYjIg 20120717T062030: *: <== :GitHub39!~GitHub39@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] Updater: add some functions to access the ImageJ Updater - Johannes Schindelin 20120717T062030: *: <== :GitHub39!~GitHub39@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] Updater: add more functions to access the ImageJ Updater - Johannes Schindelin 20120717T062030: *: <== :GitHub39!~GitHub39@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] Special-case the first ImageJ Updater run - Johannes Schindelin 20120717T064128: *: <== :GitHub23!~GitHub23@sh3.rs.github.com NOTICE #fiji-devel :[fiji] dscho force-pushed updater from aa4d0a9 to 57d3841: http://git.io/ygYjIg 20120717T064128: *: <== :GitHub23!~GitHub23@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] MiniMaven: write the manifest to target/classes/ - Johannes Schindelin 20120717T064128: *: <== :GitHub23!~GitHub23@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] MiniMaven: special-case the Fiji Updater - Johannes Schindelin 20120717T064128: *: <== :GitHub23!~GitHub23@sh3.rs.github.com NOTICE #fiji-devel :[fiji/updater] Updater: add some functions to access the ImageJ Updater - Johannes Schindelin 20120717T070328: *: <== :rubikcube_work!~quassel@134.76.218.252 JOIN #fiji-devel 20120717T090844: *: <== :oosp!~oosp@188.28.22.209.threembb.co.uk JOIN #fiji-devel 20120717T122149: *: <== :oosp!~oosp@188.28.22.209.threembb.co.uk QUIT :Ping timeout: 250 seconds 20120717T123448: *: <== :oosp!~oosp@188.29.207.163.threembb.co.uk JOIN #fiji-devel 20120717T160215: *: <== :GitHub11!~GitHub11@sh2.rs.github.com NOTICE #fiji-devel :[fiji] none pushed 1 new commit to track-mate: http://git.io/sYm4aA 20120717T160215: *: <== :GitHub11!~GitHub11@sh2.rs.github.com NOTICE #fiji-devel :[fiji/track-mate] TrackMate_: WIP: moving to ImgPlus - Jean-Yves Tinevez 20120717T163926: *: <== :rubikcube_work!~quassel@134.76.218.252 QUIT :Ping timeout: 252 seconds 20120717T163943: *: <== :mahogny!~mahogny@c-eaaf72d5.015-28-73746f34.cust.bredbandsbolaget.se QUIT :*.net *.split 20120717T165720: *: <== :mahogny!~mahogny@c-eaaf72d5.015-28-73746f34.cust.bredbandsbolaget.se JOIN #fiji-devel 20120717T171958: *: <== :qwebirc1192!905c30e5@gateway/web/freenode/ip.144.92.48.229 JOIN #fiji-devel 20120717T171959: *: <== :qwebirc1192!905c30e5@gateway/web/freenode/ip.144.92.48.229 NICK :lstuyvenberg 20120717T171959: qwebirc1192# lstuyvenberg 20120717T173622: *: <== :oosp!~oosp@188.29.207.163.threembb.co.uk QUIT :Ping timeout: 248 seconds 20120717T181729: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :dscho: Rebase is over half done, though I messed a few commits up, so I'll have to re-fixup them... 20120717T181729: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: dscho: Rebase is over half done, though I messed a few commits up, so I'll have to re-fixup them... 20120717T181924: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :lstuyvenberg: yeah, with that many commits, problems were prone to crop up with the rebase. 20120717T181924: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: lstuyvenberg: yeah, with that many commits, problems were prone to crop up with the rebase. 20120717T181937: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :FMC which commits were having problems? 20120717T181937: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: FMC which commits were having problems? 20120717T181943: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :The vcproj patches? 20120717T181943: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: The vcproj patches? 20120717T182014: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Not problems; I made mistakes. :X Forgot to resolve all conflicts, so there were some <<<<< HEADs and such lying around. 20120717T182014: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Not problems; I made mistakes. :X Forgot to resolve all conflicts, so there were some <<<<< HEADs and such lying around. 20120717T182024: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Mostly in MMCoreJ_wrap/MMCoreJ_wrap.sln 20120717T182024: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Mostly in MMCoreJ_wrap/MMCoreJ_wrap.sln 20120717T182101: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Ah, of course... 20120717T182101: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Ah, of course... 20120717T182112: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Probably due to the commits removing the secret adapters? 20120717T182112: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Probably due to the commits removing the secret adapters? 20120717T182118: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Yeah. 20120717T182118: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Yeah. 20120717T182120: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :We should really get rid of those commits altogether. 20120717T182120: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: We should really get rid of those commits altogether. 20120717T182126: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :To restore them? 20120717T182126: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: To restore them? 20120717T182128: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :It's the wrong solution to the right problem. 20120717T182128: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: It's the wrong solution to the right problem. 20120717T182132: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :lol. 20120717T182132: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: lol. 20120717T182135: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :No, you can "unload" projects. 20120717T182135: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: No, you can "unload" projects. 20120717T182150: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :That state should be saveable in the solution. 20120717T182150: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: That state should be saveable in the solution. 20120717T182157: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :In the .sln, pardon me. 20120717T182157: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: In the .sln, pardon me. 20120717T182208: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Yeah. 20120717T182208: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Yeah. 20120717T182220: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :That would probably be the best solution. 20120717T182220: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: That would probably be the best solution. 20120717T182303: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Can you find out whether VS saves the "unloaded" bit with the projects? 20120717T182303: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Can you find out whether VS saves the "unloaded" bit with the projects? 20120717T182352: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :...Is there any way to reattempt the patch from a rebase --continue? Rebase ran into a conflict, and I accidentally git add'd a file I wasn't done with, so I reset it, so now the diff info is gone... 20120717T182352: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: ...Is there any way to reattempt the patch from a rebase --continue? Rebase ran into a conflict, and I accidentally git add'd a file I wasn't done with, so I reset it, so now the diff info is gone... 20120717T182354: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I'll look into it. 20120717T182354: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I'll look into it. 20120717T182658: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Nevermind, I think I've got it sorted... 20120717T182658: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Nevermind, I think I've got it sorted... 20120717T182712: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Oh... 20120717T182712: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Oh... 20120717T182730: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :You mean you want to get the diff that was to be applied? 20120717T182730: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: You mean you want to get the diff that was to be applied? 20120717T182735: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :That's in .git/rebase-merge/patch 20120717T182735: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: That's in .git/rebase-merge/patch 20120717T182745: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :(I probably shouldn't take pride in setting the standard for 'foolproof', but at least now you know what sort of functionality someone like me needs in git. ;) ) 20120717T182745: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: (I probably shouldn't take pride in setting the standard for 'foolproof', but at least now you know what sort of functionality someone like me needs in git. ;) ) 20120717T183726: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Hehe. 20120717T183726: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Hehe. 20120717T183909: *: <== :joshmoore!~joshmoore@manz-590efd53.pool.mediaWays.net QUIT :Read error: Operation timed out 20120717T184354: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :...Huh. I am apparently ahead of origin/wip-rebase by 156 commits? 20120717T184354: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: ...Huh. I am apparently ahead of origin/wip-rebase by 156 commits? 20120717T184424: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Uh oh. 20120717T184424: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Uh oh. 20120717T184433: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I have duplicate commits in the log. 20120717T184433: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I have duplicate commits in the log. 20120717T184440: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Hehe... 20120717T184440: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Hehe... 20120717T184501: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :BTW 156 ahead of origin/wip-rebase sounds right. After all, you are rebasing, so the commits you make now are considered new. 20120717T184501: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: BTW 156 ahead of origin/wip-rebase sounds right. After all, you are rebasing, so the commits you make now are considered new. 20120717T184512: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay... And the duplicated commits? 20120717T184512: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay... And the duplicated commits? 20120717T184621: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :They probably want to be squashed together? 20120717T184621: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: They probably want to be squashed together? 20120717T184626: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :How do the diffs look like? 20120717T184626: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: How do the diffs look like? 20120717T184634: *: <== :joshmoore!~joshmoore@manz-590efd53.pool.mediaWays.net JOIN #fiji-devel 20120717T184928: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Identical. 20120717T184928: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Identical. 20120717T184941: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :And there is no merge commit between them? 20120717T184941: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: And there is no merge commit between them? 20120717T184958: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :(gitk ... will tell you) 20120717T184958: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: (gitk ... will tell you) 20120717T185058: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Oh! 20120717T185058: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Oh! 20120717T185116: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay; one is from before the start of the merging rebase. 20120717T185116: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay; one is from before the start of the merging rebase. 20120717T185249: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :...I don't suppose there's any good way to get a full diagram of the repository since openspim diverged from master? 20120717T185249: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: ...I don't suppose there's any good way to get a full diagram of the repository since openspim diverged from master? 20120717T185307: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Preferably including wip-rebase... 20120717T185307: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Preferably including wip-rebase... 20120717T185513: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Odd. My fixups don't seem to have taken hold; they're not in the commit history any more, but their targets seem unchanged. 20120717T185513: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Odd. My fixups don't seem to have taken hold; they're not in the commit history any more, but their targets seem unchanged. 20120717T185629: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :lstuyvenberg: you can try using "gitk --all". But it is not really a good view because you cannot collapse branches. 20120717T185629: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: lstuyvenberg: you can try using "gitk --all". But it is not really a good view because you cannot collapse branches. 20120717T185642: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :So you won't get a bird view on it. 20120717T185642: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: So you won't get a bird view on it. 20120717T185700: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Drat. 20120717T185700: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Drat. 20120717T185724: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :What you _could_ do to get a better picture: "git rev-list origin/svn/git-svn..origin/wip-rebase | wc -l" 20120717T185724: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: What you _could_ do to get a better picture: "git rev-list origin/svn/git-svn..origin/wip-rebase | wc -l" 20120717T185742: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :And do that for all the pairs of branches you care about. 20120717T185742: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: And do that for all the pairs of branches you care about. 20120717T185811: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Then you can draw a little diagram where you put those numbers on the edges between the vertices. 20120717T185811: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Then you can draw a little diagram where you put those numbers on the edges between the vertices. 20120717T190921: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Paper and pencil, here we go... 20120717T190921: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Paper and pencil, here we go... 20120717T191156: *: <== :GitHub135!~GitHub135@sh2.rs.github.com NOTICE #fiji-devel :[fiji] none pushed 1 new commit to imglib2-spim: http://git.io/W_j6AQ 20120717T191156: *: <== :GitHub135!~GitHub135@sh2.rs.github.com NOTICE #fiji-devel :[fiji/imglib2-spim] [SPIM_Registration] replace all uses of fiji.util KDTree by net.imglib2.collection KDTree. - Tobias Pietzsch 20120717T191819: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :dscho: wip-rebase is effectively a clone of openspim, with its merge base at master's HEAD, correct? Then what is merge-base HEAD origin/oepnspim giving me...? 20120717T191819: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: dscho: wip-rebase is effectively a clone of openspim, with its merge base at master's HEAD, correct? Then what is merge-base HEAD origin/oepnspim giving me...? 20120717T192028: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :(It's giving me origin/openspim's latest commit...) 20120717T192028: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: (It's giving me origin/openspim's latest commit...) 20120717T193103: *: <== :GitHub145!~GitHub145@sh2.rs.github.com NOTICE #fiji-devel :[fiji] dscho pushed 2 new commits to master: http://git.io/TZwN5g 20120717T193103: *: <== :GitHub145!~GitHub145@sh2.rs.github.com NOTICE #fiji-devel :[fiji/master] Bead-registration: add a main() method to make debugging easier - Johannes Schindelin 20120717T193103: *: <== :GitHub145!~GitHub145@sh2.rs.github.com NOTICE #fiji-devel :[fiji/master] Bead registration: work around an unwelcome behavior of GenericDialog - Johannes Schindelin 20120717T195829: *: <== :GitHub193!~GitHub193@sh3.rs.github.com NOTICE #fiji-devel :[fiji] dscho pushed 1 new commit to master: http://git.io/xEnJNg 20120717T195829: *: <== :GitHub193!~GitHub193@sh3.rs.github.com NOTICE #fiji-devel :[fiji/master] Bead Registration: only record values when the dialog was not canceled - Johannes Schindelin 20120717T200232: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 QUIT :Ping timeout: 245 seconds 20120717T201620: *: <== :oosp!~oosp@cpc8-slam5-2-0-cust233.2-4.cable.virginmedia.com JOIN #fiji-devel 20120717T201906: *: <== :qwebirc34837!905c30e5@gateway/web/freenode/ip.144.92.48.229 JOIN #fiji-devel 20120717T201906: *: <== :qwebirc34837!905c30e5@gateway/web/freenode/ip.144.92.48.229 NICK :lstuyvenberg 20120717T201906: qwebirc34837# lstuyvenberg 20120717T201917: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :dscho: git push origin HEAD:origin/openspim? 20120717T201917: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: dscho: git push origin HEAD:origin/openspim? 20120717T202142: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :wip-rebase:openspim...? 20120717T202142: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: wip-rebase:openspim...? 20120717T202210: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I did the latter; git gave no complaint. 20120717T202210: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I did the latter; git gave no complaint. 20120717T202441: *: <== :joshmoore!~joshmoore@manz-590efd53.pool.mediaWays.net QUIT :Quit: Leaving. 20120717T202530: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :lstuyvenberg: the first one was incorrect since the branch is not called "origin/openspim" on the remote side ;-) 20120717T202530: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: lstuyvenberg: the first one was incorrect since the branch is not called "origin/openspim" on the remote side ;-) 20120717T202553: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :The latter worked because your HEAD is actually pointing to wip-rebase. 20120717T202553: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: The latter worked because your HEAD is actually pointing to wip-rebase. 20120717T202614: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Now, to switch back to normal, you can "git branch -m openspim" 20120717T202614: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Now, to switch back to normal, you can "git branch -m openspim" 20120717T202907: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :"fatal: A branch named 'openspim' already exists." Should I git checkout and then git pull instead? 20120717T202907: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: "fatal: A branch named 'openspim' already exists." Should I git checkout and then git pull instead? 20120717T203158: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Followed with a branch -d? 20120717T203158: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Followed with a branch -d? 20120717T203216: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :git branch -d openspim && git branch -m openspim 20120717T203216: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: git branch -d openspim && git branch -m openspim 20120717T203229: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :The -d will only succeed if that branch has been fully merged into HEAD. 20120717T203229: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: The -d will only succeed if that branch has been fully merged into HEAD. 20120717T203242: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :...It succeeded. 20120717T203242: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: ...It succeeded. 20120717T203305: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :... because of the merging rebase... 20120717T203305: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: ... because of the merging rebase... 20120717T203310: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Success. 20120717T203310: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Success. 20120717T203400: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Ahh! In the time I spent rebasing, they made a bunch more commits! D: 20120717T203400: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Ahh! In the time I spent rebasing, they made a bunch more commits! D: 20120717T203417: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :(I think.) 20120717T203417: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: (I think.) 20120717T203609: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay. Doing a full rebuild of MMCoreJ_wrap.sln. 20120717T203609: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay. Doing a full rebuild of MMCoreJ_wrap.sln. 20120717T203617: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :;-) 20120717T203617: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: ;-) 20120717T204354: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :78 succeeded, 32 failed. 20120717T204354: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: 78 succeeded, 32 failed. 20120717T204540: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I just realized, I made Ant build files for every plugin _except ours_. And with Fakefile now nonexistent, there's no immediate way to build them... 20120717T204540: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I just realized, I made Ant build files for every plugin _except ours_. And with Fakefile now nonexistent, there's no immediate way to build them... 20120717T204820: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Hehe, yeah, we should use ant to build our stuff... 20120717T204820: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Hehe, yeah, we should use ant to build our stuff... 20120717T205735: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay, so apparently I missed another merge conflict, and now that I've squished away the wip-rebase... 20120717T205735: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay, so apparently I missed another merge conflict, and now that I've squished away the wip-rebase... 20120717T205744: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I'll just do a fixup commit. :S 20120717T205744: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I'll just do a fixup commit. :S 20120717T205819: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Uh, one other issue, having done the branch -m 20120717T205819: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Uh, one other issue, having done the branch -m 20120717T205842: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :I think the remote branch for the new 'openspim' is still set to origin/wip-rebase. 20120717T205842: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: I think the remote branch for the new 'openspim' is still set to origin/wip-rebase. 20120717T210349: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu QUIT :Quit: dscho 20120717T210614: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu JOIN #fiji-devel 20120717T210614: *: <== :ChanServ!ChanServ@services. MODE #fiji-devel +o dscho 20120717T210848: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :dscho: git status reports that I'm behind origin/wip-rebase by 156 commits (instead of a few commits ahead of origin/openspim). 20120717T210848: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: dscho: git status reports that I'm behind origin/wip-rebase by 156 commits (instead of a few commits ahead of origin/openspim). 20120717T210935: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Right, that's because we rebased them. 20120717T210935: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Right, that's because we rebased them. 20120717T210953: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :You can set the upstream branch with: git config branch.openspim.merge refs/heads/openspim 20120717T210953: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: You can set the upstream branch with: git config branch.openspim.merge refs/heads/openspim 20120717T211020: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay. There's some other things I have to fix; they made some changes using commons math 2.0... 20120717T211020: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay. There's some other things I have to fix; they made some changes using commons math 2.0... 20120717T211032: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :And I have a feeling I'll be seeing many such changes. 20120717T211032: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: And I have a feeling I'll be seeing many such changes. 20120717T211520: *: <== :zaytsev!~zaytsev@unaffiliated/zaytsev PRIVMSG #fiji-devel :dscho: lstuyvenberg: http://git-animals.tumblr.com/ 20120717T211520: zaytsev!~zaytsev@unaffiliated/zaytsev: dscho: lstuyvenberg: http://git-animals.tumblr.com/ 20120717T211710: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :lstuyvenberg: likely, until commons-math 3.0 final comes out and they use it. 20120717T211710: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: lstuyvenberg: likely, until commons-math 3.0 final comes out and they use it. 20120717T211718: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :But then, we can help them get there... 20120717T211718: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: But then, we can help them get there... 20120717T211821: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Which comes with its own slew of work. 20120717T211821: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Which comes with its own slew of work. 20120717T211832: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :zaytsev: I'm partial to the baby bird leaving the nest analogy. 20120717T211832: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: zaytsev: I'm partial to the baby bird leaving the nest analogy. 20120717T211920: *: <== :zaytsev!~zaytsev@unaffiliated/zaytsev PRIVMSG #fiji-devel :lstuyvenberg: nest... Nest... NEST... wait!!! i'm on holidays. don't talk to me about NEST :-/ 20120717T211920: zaytsev!~zaytsev@unaffiliated/zaytsev: lstuyvenberg: nest... Nest... NEST... wait!!! i'm on holidays. don't talk to me about NEST :-/ 20120717T211943: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :lol. 20120717T211943: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: lol. 20120717T213628: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :dscho: Okay! All the plugins except ours now build under Ant, provided the stars line up and the user compiles everything in the right order. 20120717T213628: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: dscho: Okay! All the plugins except ours now build under Ant, provided the stars line up and the user compiles everything in the right order. 20120717T215039: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Hehe. 20120717T215039: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Hehe. 20120717T215045: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :That's good news! 20120717T215045: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: That's good news! 20120717T215220: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 PRIVMSG #fiji-devel :Okay, now I'm done with our plugins' build files... I'll submit those as a fixup also, but now I'm out of time. :( Do you have time to help me with the Orca tomorrow? 20120717T215220: lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229: Okay, now I'm done with our plugins' build files... I'll submit those as a fixup also, but now I'm out of time. :( Do you have time to help me with the Orca tomorrow? 20120717T215309: *: <== :dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu PRIVMSG #fiji-devel :Yes, I will make sure I have time! 20120717T215309: dscho!~gene099@dyn-144-92-48-243.microscopy.wisc.edu: Yes, I will make sure I have time! 20120717T215539: *: <== :lstuyvenberg!905c30e5@gateway/web/freenode/ip.144.92.48.229 QUIT :