Camelia, the Perl 6 bug

IRC log for #bioclipse, 2011-05-11

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

All times shown according to UTC.

Time Nick Message
04:03 sneumann_ joined #bioclipse
04:26 sneumann_ left #bioclipse
04:49 egonw joined #bioclipse
06:15 sneumann_ joined #bioclipse
07:05 Gpox joined #bioclipse
07:18 cande joined #bioclipse
07:52 egonw left #bioclipse
08:20 jonalv joined #bioclipse
08:49 egonw joined #bioclipse
09:39 CIA-70 bioclipse.core: Christian Ander master * r7849a2c / plugins/net.bioclipse.business/src/net/biocl​ipse/business/BioclipsePlatformManager.java : Changed openURL to public - http://bit.ly/jUJ5cE
09:39 CIA-70 bioclipse.core: Christian Ander master * r6118900 / (121 files in 62 dirs): Merge branch 'master' of github.com:bioclipse/bioclipse.core - http://bit.ly/koUgq4
09:42 olass joined #bioclipse
09:43 olass cande: your last commit on bioclipse.core contains a merge
09:43 olass jonalv: can you comment on this?
09:43 olass seems a bit long to me...
09:44 jonalv olass: sry what? Can I comment on merge commits?
09:44 olass just wondering :)
09:44 jonalv or on long commits?
09:44 olass I was surprised to see so many changes to core by cande in a commit
09:45 jonalv I know some people do not like merge commits. I however am not one of them. I know some people disslike long commits and so do I...
09:45 cande yes, i just changed 1 line
09:45 cande i dont know what happend
09:45 olass cande: did you not do a fetch/rebase first? is that the problem?
09:45 jonalv uhm if you just changed one line how come the commit claims to change 121 files?
09:45 olass my words...
09:45 olass that's why I asked
09:46 jonalv soudns strange
09:46 cande olass: i did my commit before doing the fetch
09:46 cande could be it
09:46 olass cande: you must have noticed that you pushed a commit of 121 files, and that this was strange...
09:46 cande i got a fast-forward error, did a pull, and then a push
09:46 * olass did not even think cande had commit bits to core
09:47 olass cande: core is not your repo, and please communicate before pushing there
09:47 cande olass: sure
09:47 olass but maybe this was already done, I am just making sure
09:47 olass (since the commit seemed a bit strange)
09:48 olass so no offence intended
09:48 cande well, the one line change is cleared
09:48 olass just wanted to get things right :)
09:48 jonalv yea maybe revert that one and look through it?
09:48 olass +1
09:48 cande but the other things i dont know.. it did not come from me
09:48 olass then don't iclude them in teh commit
09:48 olass only include the file you changed
09:49 cande well i didnt
09:49 jonalv I am thinking there is some branch mixup going on here
09:49 cande it was git
09:49 olass jonalv: probably
09:49 cande different between head and master?
09:49 * olass runs into these issues every now and then as well and need to ask jonalv
09:50 jonalv cande: I don't know what you have done
09:50 cande i can tell you the commands i did :)
09:51 cande if you want?
09:53 olass cande: sorry, but the core committers are me, jonalv, and Gpox. You should send patches for core to one of us for review as this is the structure we have decided upon to maintain a stable core.
09:53 olass you should not have commit rights there :)
09:53 olass that way these issues never arises, it is dangerous if everyone can commit in core
09:54 cande true
09:54 cande i'll do that next time
09:54 olass super
09:54 olass make no mistake, we am happy you commit to core
09:54 olass but should be sent as patch
09:55 * olass is in fact very happy that cande is getting up to speed with committing!
09:55 olass cande++
09:56 candel joined #bioclipse
09:58 jonalv hm reveting a merge seems to be a not so easy
09:58 olass cande == candel?
09:58 candel yes im me :)
09:59 cande left #bioclipse
09:59 olass cande: i'll do that next time
09:59 olass [11:54] olass: super
09:59 olass [11:54] olass: make no mistake, we am happy you commit to core
09:59 olass [11:54] olass: but should be sent as patch
09:59 olass [11:55] • olass is in fact very happy that cande is getting up to speed with committing!
09:59 olass [11:55] olass: cande++
09:59 olass just reposting...
09:59 olass in case it got lost...
09:59 candel hehe ok :O
09:59 candel :)
09:59 olass @karma cande
09:59 zarah cande has a karma of 12
09:59 olass @karma candel
09:59 zarah candel has a karma of 0
10:00 olass @karma olass
10:00 zarah olass has a karma of 140
10:00 candel is now known as cande
10:00 olass @karma jonalv
10:00 zarah jonalv has a karma of 270
10:00 olass @karma olas
10:00 zarah olas has a karma of 51
10:00 olass :(
10:00 cande so should we revert the commit?
10:00 jonalv cande: I need to know what you ahve done in order to know how we should revert it
10:00 cande jonalv: sure
10:00 jonalv Gpox: ping
10:00 olass cande: yes, please revert
10:01 olass hehe, calling for the master :)
10:01 * jonalv is hoping he might recognize some of that code and tell me from which branch it is comming
10:01 jonalv or maybe you have figured that out cande?
10:02 cande might be from 2.4..,.
10:02 cande but i can just revert it and send you a patch instead
10:03 jonalv cande: good luck with that
10:04 jonalv it't a bit of a mess, reverting merges
10:04 jonalv depending on whether you have merged something that we are never going to merge or if you have merged something that we are going to need to merge sometime in the furture we need to do a little different things it seems
10:05 jonalv or hm
10:05 * jonalv is reading what Linus wrote on the topic...
10:10 jonalv hm seems there is a branch in bioclispe core named origin which is what you have merged
10:11 olass left #bioclipse
10:12 jonalv Gpox: ping
10:12 Gpox jonalv: pong
10:12 jonalv can you see what is going on in bioclipse.core?
10:13 jonalv candes laste commit...
10:13 jonalv I am not entirely sure how to handle it...
10:13 Gpox well the merge merges in a one line change, it should be ok just looks uggly
10:14 cande it lookes like I merged my commit, when my system were updated on 2011-02-07
10:15 cande with the latestet you commited jonalv
10:15 jonalv hm, yea it seems someone has created a branch named origin
10:15 egonw cande: yes, please rebase before you commit next time :)
10:15 jonalv would that be me?
10:15 jonalv :)
10:16 jonalv or is that just a local thin on my machine?
10:16 * jonalv is confused here...
10:16 jonalv :)
10:16 jonalv ah it is local
10:16 egonw upstream now has a branched history
10:16 jonalv nm then
10:16 Gpox no origin branch on master
10:16 Gpox github
10:17 jonalv I got side tracked benacue I had a local origin branch with head at exactly the commit cande had branched of from
10:18 jonalv Gpox: so we should not touch anything then?
10:19 jonalv cool
10:20 cande jonalv: what are the odds :)
10:20 Gpox from a souce code perspective it is allright
10:20 * jonalv goes back to hacing then...
10:21 jonalv good thing it was not a branch mix up
10:22 cande egonw: yes next time i will use rebase
10:22 jonalv hm it's lunch time!
10:22 jonalv :)
10:22 * jonalv afk
10:24 cande Gpox: can we do a build and see if my commit is working?
10:28 Gpox done
10:39 cande thx
10:41 cande den blev blå! :)
10:41 cande Gpox++
10:49 egonw left #bioclipse
10:59 cande left #bioclipse
11:20 sneumann_ left #bioclipse
11:25 olass joined #bioclipse
11:43 olass left #bioclipse
12:02 cande joined #bioclipse
12:17 egonw joined #bioclipse
13:17 sneumann_ joined #bioclipse
14:04 olass joined #bioclipse
14:40 olass left #bioclipse
15:21 Gpox left #bioclipse
16:05 cande left #bioclipse
16:07 jonalv left #bioclipse
18:56 olass joined #bioclipse
18:56 olass left #bioclipse
19:13 CIA-70 left #bioclipse
20:46 egonw left #bioclipse

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