Camelia, the Perl 6 bug

IRC log for #cdk, 2009-04-17

| Channels | #cdk index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
05:18 jbrefort joined #cdk
05:52 Gpox joined #cdk
08:17 edrin joined #cdk
08:19 shk3 joined #cdk
08:45 jbrefort joined #cdk
08:46 jbrefort joined #cdk
08:51 egonw joined #cdk
11:07 maclean joined #cdk
11:14 maclean joined #cdk
11:14 maclean joined #cdk
13:15 rajarshi_ joined #cdk
13:15 rajarshi_ egon, good morning
13:17 egonw hi rajarshi
13:17 egonw I am recompiling my course material against CDK 1.2.1
13:17 egonw and it worked
13:18 egonw " This book is written for version 1.2.1 " :)
13:18 egonw mind you, all download links etc, have been updated :)
13:18 egonw $ git checkout -b cdk1.2.1 origin/cdk-1.2.x
13:18 egonw even that sort of stuff
13:18 maclean yay! finished s/chain/strand/-ing.
13:19 egonw maclean++
13:19 maclean er...the other way.
13:19 egonw yes, yes... details
13:19 maclean now just to make the small patch...
13:19 rajarshi_ nice
13:20 rajarshi_ btw, if I am to push your reviewed patches into master/1.2.x do I need a repo checked out via ssh?
13:20 egonw not sure what you want to do, and how the ssh repo comes in
13:21 rajarshi_ git clone git://.... doesn't let me push changes ot SF, as far as I knew
13:21 rajarshi_ or does it?
13:21 egonw because that is a clone and not a push?
13:22 egonw see wiki
13:22 egonw you need the ssh:// variant
13:22 rajarshi_ no, I start of with a repo via git clone git://..., then review your patches, merge into my master and push master back to SF
13:22 rajarshi_ oh ok, got it
13:22 egonw see wiki
13:22 egonw git clone ssh://$YOURSFACCOUNT@cdk.git.sourceforge.net/gitroot/cdk
13:23 egonw if you cloned like that
13:23 egonw a mere 'git push' should work
13:23 rajarshi_ right, just saw that
13:23 egonw don't forget the signof
13:23 rajarshi_ right
13:27 egonw added info on signoff to the wiki
13:29 maclean dammit.
13:29 maclean I just managed to delete the build.xml instead of removing it from the commit list.
13:29 rajarshi_ :)
13:29 maclean I can't seem to reset it
13:29 maclean or check it back out
13:29 maclean or set it to be ignored
13:30 maclean is there a standard fix for this?
13:30 maclean (apart from time-travel)
13:30 rajarshi_ add it to .gitignore ?
13:30 maclean hmmm. okay
13:31 rajarshi_ but I don't klnow if that prevents updates to build.xml as well (which I think you'd want)
13:31 egonw rajarshi: no, that's not what to do, I think
13:31 egonw maclean: try
13:31 egonw git reset HEAD build.xml
13:31 egonw followed by
13:31 egonw git checkout build.xml
13:32 maclean .git reset HEAD build.xml
13:32 maclean build.xml: locally modified
13:32 maclean I changed it, before deleting it...
13:32 rajarshi_ egonw: going to look at your patches. Is there a branch I should pull from? your email doesn't seem to indicate anything
13:32 egonw that might very well be lost
13:32 egonw each patch is a branch
13:33 rajarshi_ d'oh
13:33 maclean the change was only to get around the check for ant 1.7.1, which I could not be bothered updating.
13:34 egonw maclean: but you need 1.7.1
13:34 egonw 1.7.0 is not good enough
13:34 maclean not noticeably.
13:34 egonw that suprises me
13:34 egonw because we had a bug with 1.7.0
13:35 maclean well, I probably didn't run whatever task triggers the bug.
13:35 egonw I think it was regarding for-each or so
13:35 maclean I only needed the javacc
13:35 egonw ah, yes, that might very well work
13:40 rajarshi_ egonw: are yourpatches for 1.2.x or master?
13:41 egonw 1.2.x
13:41 egonw if you run something like gitk or gitx
13:41 rajarshi_ so I should checkout into origin/cdk-1.2.x ?
13:41 egonw you can mostly like see that from the labels
13:42 egonw well, only if you pull the full tree, of course... (sorry)
13:42 rajarshi_ or ratehr, how do I merge my branch XYZ into cdk-1.2.x
13:42 egonw what I do is:
13:42 egonw create local branch
13:42 egonw pull patch
13:42 rajarshi_ ok, done that
13:42 egonw (or git am 0001-EMAIL.path)
13:42 egonw test it
13:42 egonw and then merge into cdk-1.2.x
13:42 egonw umm
13:43 egonw where the 'pull patch' was into the new local (temp) branch
13:43 egonw (just to get the details right :)
13:43 rajarshi_ right, the question is how to merge in to 1.2.x - when I do git checkout origin/cdk-1.2.x, it says that it isn't a local branch
13:44 egonw do you have a local branch of cdk-1.2.x already?
13:44 egonw if not, do:
13:44 egonw git checkout -b cdk-1.2.x origin/cdk-1.2.x
13:44 egonw or
13:44 rajarshi_ aah. thanks!
13:44 egonw git checkout -b local-cdk-1.2.x origin/cdk-1.2.x
13:45 rajarshi_ so then merge and push inside local-cdk-1.2.x sends it to cdk-1.2.x on SF, right?
13:46 rajarshi_ also, this means I should be branching from local-cdk-1.2.x and then testing your patches
13:46 egonw yes
13:46 egonw amd yes
13:46 rajarshi_ ok - just merged your patch based of master and got 30 commits! that didn't seem right :)
13:47 rajarshi_ anyway, off to the dentist, bbl
13:47 egonw thats because trunk also contains a number of patches not in cdk-1.2.x
13:58 maclean egonw : patch made (209Kb!) - where would you like me to put it?
13:59 egonw www.ebi.ac.uk/~gilleain/cdk.git
14:00 maclean hmmm. that's a different thing, but okay.
14:00 egonw it's not too difficult
14:00 egonw did you use git formatpatch?
14:00 egonw then upload it to SF
14:01 maclean I did git diff -p
14:01 egonw oh...
14:01 egonw why?
14:01 maclean I was doing it as a patch because of the build.xml thing, that..
14:01 maclean why not?
14:01 egonw don't you want your name to show up in the CDK history?
14:02 maclean er...I don't particularly care, but I'll do it another way if preferred.
14:03 egonw yes, I prefer that
14:03 egonw and will support the effort
14:03 egonw mentally
14:03 egonw and possibly helping with what commands to type
14:03 egonw but first I get a cup of coffee
14:11 maclean right, did that.
14:14 maclean :D http://drnicwilliams.com/2008/​02/03/using-git-within-a-team/
14:14 zarah maclean's link is also http://tinyurl.com/2odyhz
14:14 maclean 'If George Lucas hadn’t cut away from the cockpit of the Death Star to show us the planet Alderaan being obliterated, I guarantee you that Tarkin was waving his arms in the air, yelling “Oh that’s what I’m talkin’ ’bout,” with his lackies were all high-fiving each other in the background.'
14:16 egonw what?
14:16 maclean The next sentence is : "This brings me to Git."
14:16 egonw ah, ic
14:17 egonw well... no, I don't...
14:17 maclean "Both Git and the Death Star are technologically impressive and to associate with them is to be seen as “cool”, but they can both do so much more."
14:17 egonw but anyway...
14:17 maclean yes, anyway..
14:17 egonw it's Fri
14:17 maclean I did the format-patch thing
14:18 egonw cool
14:18 egonw put it on SF
14:18 maclean Copy that, gold leader.
14:25 maclean hmmm. sourceforge https isn;t working for me today. sigh.
14:25 egonw :(
14:26 * egonw is trying a one liner to count the number of atoms in a PubChem entry
14:29 maclean in groovy?
14:29 egonw yes
14:32 egonw ok, failed
14:32 egonw it's not one line
14:40 egonw maclean: 5 lines
14:40 egonw reader = new PCCompoundXMLReader(
14:40 egonw new URL("http://pubchem.ncbi.nlm.nih.gov/summary/s​ummary.cgi?cid=5282253&disopt=SaveXML").newInputStream()
14:40 egonw )
14:40 egonw def mol = reader.read(new NNMolecule())
14:40 egonw println "Atom count: $mol.atomCount"
14:40 egonw pretty cool
14:40 zarah egonw's link is also http://tinyurl.com/d7q5bf
14:41 egonw pretty groovy
14:41 egonw as they say
14:53 maclean heh.
14:53 egonw http://chem-bla-ics.blogspot.com/2009/04/​downloading-domoic-acid-from-pubchem.html
14:53 zarah egonw's link is also http://tinyurl.com/cgnfya
15:04 maclean heh. Author : steinbeck. Date : 2000-11-10. Commit comment : Added Molecule class.
15:05 egonw :)
15:05 maclean gitk++
15:13 * egonw needs to be heading home
15:25 edrin joined #cdk
15:36 edrin1 joined #cdk
16:02 rajarshi egonw, quicky - how do I push my local-cdk-1.2.x to origin/cdk-1.2.x? doing git push just says eevrything upto date
16:36 CIA-58 cdk: shk3 * r14555 /cdk/branches/jchempaint-primary/src/main/o​rg/openscience/cdk/renderer/Renderer.java: See bug #2771009
18:15 Gpox joined #cdk
18:59 Gpox joined #cdk
19:02 maclean joined #cdk

| Channels | #cdk index | Today | | Search | Google Search | Plain-Text | summary