Camelia, the Perl 6 bug

IRC log for #bioclipse, 2009-03-10

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

All times shown according to UTC.

Time Nick Message
07:37 Gpox joined #bioclipse
07:42 Gpoks joined #bioclipse
08:23 edrin joined #bioclipse
08:43 charlgren joined #bioclipse
08:44 masak joined #bioclipse
08:46 rojasm joined #bioclipse
08:58 olass joined #bioclipse
09:13 jonalv joined #bioclipse
09:14 jonalv oh hai
09:14 zarah hello jonalv, you fantastic person you
09:26 egonw joined #bioclipse
10:02 shk3 joined #bioclipse
10:06 olass egonw: Gpox needs some assistance/discussions with merging CDK, JCP, and Bioclipse
10:06 olass many branches and updates here and there that affects the current state
10:08 olass egonw: you will not come to BMC today I take it?
10:08 egonw correct
10:08 egonw sorry about that
10:09 egonw but we had to put up adverts this morning
10:09 olass ack
10:09 egonw and see two possible houses this afternoon
10:09 egonw Gpox: yes, indeed... we need to start talking about that...
10:09 egonw Gpox: CDK 1.2.0 needs to be released first...
10:09 olass but tomrrow you will be here?
10:09 egonw which is imminent...
10:09 egonw yes, think so
10:10 egonw olass, Gpox: but VR proposals need to be finished first
10:10 shk3 hi all
10:10 olass egonw: oh no
10:10 egonw hi shk3
10:10 zarah hi shk3
10:10 zarah shk3: You have new messages. Write '/msg zarah @messages' to read them.
10:10 olass that will delay Bc2 with weeks!
10:10 egonw well, from my perspective... new release requirements keep being added...
10:11 olass egonw: Gpox is sort of stuck in JCP work now
10:11 egonw we can release BC2 without the branch merging...
10:11 olass he can't work on it
10:11 egonw but as Gpox indicates...
10:11 olass so he needs a merge
10:11 egonw it blocks his work...
10:11 olass yes
10:11 egonw this merge is not easy...
10:11 shk3 merge of what exactly?
10:11 egonw shk3: rebase jchempaint-prim on cdk1.2.x
10:12 shk3 ah, ok
10:12 shk3 that might be tricky
10:12 egonw this has to be done right
10:12 olass well, the situation must be resolved in some way. If merge is not the solution, then something else must be done
10:12 egonw olass: this was planned for *after* the BC2.0 release
10:12 Gpox only jcp-primary <=> bioclipse
10:12 egonw Gpox: ah, OK...
10:12 egonw that simplifies things greatly...
10:12 olass ok, maybe I misunderstood the problem
10:12 shk3 that should not be a problem
10:13 egonw Gpox: I've seen some commits to org...control and ...render in BC2 SVN...
10:13 egonw Gpox: please verify that all patches are applied to jcp-prim too...
10:13 shk3 I synchronized org...control some days ago
10:13 egonw Gpox: after that, please signal me, and I will synchronize
10:13 egonw shk3: yes, saw that...
10:14 Gpox ok, i will do that
10:14 egonw shk3: I think you ensured no patches were lost, right?
10:14 shk3 yes
10:14 shk3 but better double check
10:14 shk3 there were some sort of conflicts
10:14 shk3 Gpox and me
10:14 shk3 had both
10:15 shk3 moved stuff from stereo module to hub
10:33 thomas_ku joined #bioclipse
10:35 egonw hi thomas_ku
10:36 thomas_ku moin
10:36 zarah privet thomas_ku
10:36 shk3 Gpox: Today I will try to add merging of atoms to JCP
10:37 shk3 I think this is somthing we need for a release
10:37 shk3 right now, the user can't add ring closures
10:37 shk3 after that, I can't think of any features missing
10:38 Gpox i gonna fix the selection/highlight mess
10:38 shk3 very good
10:38 shk3 I will try to join in with bug fixing after I've done the merge
10:41 Gpox @pz 590
10:41 zarah http://pele.farmbio.uu.se/cgi-b​in/bugzilla/show_bug.cgi?id=590
10:43 egonw http://google-code-updates.blogspot.com/2009/​03/now-accepting-applications-for-google.html
10:44 zarah egonw's link is also http://tinyurl.com/bjkbba
10:44 egonw masak, jonalv: that's for you
10:44 egonw olass: you still apply too, btw
10:44 masak egonw: ack.
10:44 egonw $4500
10:44 egonw before tax
10:44 masak that's nice.
10:49 jonalv egonw: that sounds intresting but how do you do it?
10:49 jonalv I mean we can\t both be students and mentors right? :)
10:50 shk3 Is there a cdk project in summer of code?
10:50 egonw shk3: no
10:50 egonw jonalv: you would apply to be student
10:51 egonw ah... ic
10:51 egonw sorry... too early...
10:51 jonalv egonw: but first we need a mentor to apply...
10:51 egonw this is application for mentoring organizations
10:51 jonalv it seems a bit complicated to me...
10:52 egonw thought they were already further down the track
12:58 * egonw is pretty brain dead now
12:58 egonw so defaults to some CDK/Bioclipse hacking...
13:18 jonalv joined #bioclipse
13:32 olass joined #bioclipse
14:05 stain whome of you will be at http://www.ebi.ac.uk/training/hands​on/course_090420_cdk_industry.html   ?
14:05 zarah stain's link is also http://tinyurl.com/cthpzd
14:05 egonw I, Ola...
14:05 egonw Jonathan may be
14:05 masak stain: http://ask.yahoo.com/20021113.html
14:05 zarah masak's link is also http://tinyurl.com/en8dm
14:06 masak just sayin'.
14:06 stain masak: but I used the incorrect "whome" anyway :)
14:06 masak stain: yes, two errors at the same time.
14:06 masak in the same word. not bad.
14:06 masak stain++ # innovative wrongness
14:07 stain I take this as an indication that I should stay in Manchester
14:07 masak :D
14:07 masak stain: I have sharp teeth, but I don't bite.
14:11 CIA-55 bioclipse: carl_masak * r9274 /bioclipse2/trunk/plugins/ (9 files in 8 dirs): (log message trimmed)
14:11 CIA-55 bioclipse: removed incomprehensible 'do not use async' comment
14:11 CIA-55 bioclipse: The whole comment read '// do not use async, we need the GUI!', and had been
14:11 CIA-55 bioclipse: copied/pasted to several places in the code base. Since no-one seems to know
14:11 CIA-55 bioclipse: what it means, I removed it. Some good code comment practices:
14:11 CIA-55 bioclipse: - Do not contradict the code in the comment. (e.g. use async when the
14:11 CIA-55 bioclipse:  comment says "do not use async")
14:12 masak my commit message was so long it got chopped there.
14:13 masak the rest said "If the comment is a reminder of some suboptimal or missing code to come back to later, mark it with 'TODO' or 'XXX'"
14:15 jonalv masak, egonw: WHAt was the name of the git comamnd for uncommiting?
14:15 masak jonalv: so, you've committed already?
14:15 masak jonalv: have you pushed?
14:15 jonalv masak: yes but not to svn
14:15 masak ah.
14:16 masak git checkout HEAD^
14:16 jonalv masak: are you sure?
14:16 masak no.
14:16 jonalv masak: that doesn't feel right...
14:16 masak perhaps reset is better.
14:16 jonalv somethign like revert or so?
14:16 masak reset --hard or something.
14:16 masak jonalv: no, revert is when you've pushed already.
14:17 masak revert makes a new equal and opposite commit.
14:17 jonalv masak: but those things are only in the checked out version I think
14:17 egonw git rebase -i HEAD~20 ?
14:17 egonw and remove the lines with patches you want to remove
14:17 masak jonalv: what egonw said.
14:17 egonw but be careful not to remove patches that are already in SVN...
14:17 egonw jonalv: next time...
14:17 masak indeed.
14:17 egonw use a branch
14:17 egonw and just delete the branch
14:18 jonalv egonw: I am in a branch...
14:18 egonw ok, go back to master
14:18 masak jonalv: delete it!
14:18 jonalv but I wanna keep the branch
14:18 egonw and delete the branch
14:18 jonalv ah I can remove the local branch?
14:18 egonw why?
14:18 egonw yes
14:18 jonalv I wanna merge an SVN branch and master
14:18 jonalv but I mreged from master into the branch
14:19 jonalv and now I don't know what happended...
14:19 jonalv because when I try to merge back from the branch into master it says that they are equal...
14:19 jonalv but they can't be can they?
14:19 egonw dunno
14:19 masak jonalv: of course they are.
14:19 masak you just merged them.
14:19 egonw you can't merge twice
14:20 jonalv masak: but I merged all from master into the branch
14:20 masak that means they get the same history.
14:20 masak well, merging twice is a no-op.
14:20 masak jonalv: yes, I heard you.
14:20 jonalv masak: so how do I get that history into trunk in the svn repo?
14:20 jonalv because that is what I wanna do
14:20 masak jonalv: I have no idea. start from the beginning, I think.
14:20 jonalv masak: yea that was my lan too. Which is why I need to undo the merge commit...
14:20 masak jonalv: I used to merge outwards from master to branches, but I've stopped doing that, in favour of rebase.
14:21 jonalv masak: yea I tried rebase but it turned out that that was not what I wanted to do. to many mutual commits...
14:21 masak I see.
14:21 masak that never happened to me, to be frank.
14:21 masak usually rebase rocks.
14:22 masak (but that's pure git, not git-svn, so YMMV)
14:23 egonw jonalv: cherry-pick ?
14:25 jonalv egonw: yea maybe, but I already have what I want
14:25 jonalv only it's in the wrong branch
14:25 jonalv and when I try to merge it back to master it says that they are equal
14:25 egonw OK, show me tomorrow
14:25 * jonalv wonder if he has missunderstood merge...
14:26 egonw how are you merging anyway?
14:26 jonalv masak: you sound like you think it's obvious that they are equal...
14:26 egonw how's your branch called?
14:26 jonalv i was in the branch and wrote git merge master
14:26 stain but do you guys believe it could be interesting for some random Taverna developer to come to the CDL workshop? Even when knowing no more than A-level chemistry..?
14:27 jonalv egonw: the branch is called tabbed-masterplate-editorLOCAL :)
14:27 masak jonalv: when you merge two branches, you make them equal.
14:27 masak jonalv: that's what merging does.
14:27 jonalv masak: but
14:27 egonw stain: depends on what you want to learn
14:27 jonalv masak: when I commit after that I commit to one of the branches right?
14:27 masak jonalv: aye.
14:27 stain I see GIT is very easy to deal with
14:28 jonalv masak: the other one can't be equal after that...
14:28 masak jonalv: correct.
14:28 egonw jonalv: git checkout master
14:28 stain egonw: we mainly want to make friends :)
14:28 jonalv masak:  I have only commited to one of them...
14:28 egonw jonalv: git merge tabbed-masterplate-editorLOCAL
14:28 egonw stain: excellent :) I think you qualify as participant :)
14:28 jonalv egonw: yes and then it says already up to date...
14:29 egonw jonalv: then I guess it is...
14:29 jonalv but I haven't changed master...
14:29 masak jonalv: did you really start from the beginning?
14:29 jonalv masak: uhm what do you mean?
14:29 masak jonalv: delete thre branch, etc...
14:29 masak s/r//
14:29 jonalv masak: no
14:29 masak jonalv: then I can't help you.
14:29 jonalv masak: what?
14:29 masak jonalv: then I can't help you.
14:30 jonalv ah I should delete local branch,
14:30 masak aye.
14:30 jonalv and start from the beginning
14:30 masak it's sort of destroyed by the merge.
14:30 jonalv is that what you are saying?
14:30 masak that is what I am saying.
14:30 jonalv but it's a merge with a local branch
14:30 masak you can save the commits, of course.
14:30 jonalv huh?
14:30 stain egonw: what is "CDK Community Satellite Workshop" ?
14:30 jonalv save the commits?
14:31 masak jonalv: in whatever way you please.
14:31 egonw stain: mmmm.... I guess the developer hang out
14:31 jonalv masak: but I have what I want to have in my local branch and now I awant to commit that in master
14:31 jonalv gah
14:31 masak jonalv: I know this is frustrating.
14:31 jonalv masak: I just did what you told me to do. I did the merge in abranch
14:31 masak jonalv: it will get better with time.
14:32 masak jonalv: you merged the wrong way.
14:32 masak jonalv: I usually do a rebase.
14:32 jonalv masak: and now I want to do the simple step of merging into master but it does nothing...
14:32 masak jonalv: correct.
14:32 stain egonw: I'll send Alan :)
14:32 egonw hahaha
14:33 masak jonalv: do you remember that I had a lot of problems with this a couple months ago?
14:33 jonalv masak: maybe
14:33 masak jonalv: I sent some mails your way with discussions on #git about exactly this thing.
14:33 jonalv masak: what was the solution?
14:33 masak jonalv: not to do what you just did.
14:33 jonalv masak: but you told me to do it like this...
14:33 masak at least not with git-svn.
14:33 egonw masak: please send me a copy too
14:33 masak egonw: oki.
14:35 masak email sent.
14:37 masak jonalv: as far as I recall, I haven't advised you to merge from master to a branch since I sent the first copy of that mail. what I said during lunch was that I really liked _rebase_.
14:38 jonalv masak: rebase willl force to do a million of merges... :(
14:38 masak jonalv: yes, but in the branch.
14:38 masak that's the beauty of it.
14:38 jonalv masak: but that's not what I want to do
14:38 masak you get all of the problems you'd have gotten anyway, but in the branch.
14:38 jonalv I want to merge in the branch intomaster
14:38 masak jonalv: don't do it then. geez.
14:39 jonalv I want to leave the branch behind me...
14:39 masak jonalv: not sure we're understanding each other here.
14:39 masak jonalv: I'm also talking about right before you merge back into master.
14:39 jonalv masak: I am sure we are not
14:39 masak jonalv: but there are advantages to doing rebase right before merging back into master.
14:40 jonalv masak: but merging mack into master doesn't work, I tried that. remember?
14:40 jonalv rebase in branch and the merge?
14:40 masak jonalv: that was after you merged from master to the branch.
14:40 jonalv |then merge?
14:40 masak jonalv: aye.
14:40 masak now you got it.
14:40 jonalv but the rebase is really tricky because there are conflicts all the way...
14:40 masak jonalv: that might be.
14:40 jonalv I tried that and that was a pain...
14:40 masak I've never had much problems with it.
14:41 masak all the conflicts I got were real problems in need of fixing before the merge.
14:41 masak and I got them in the branch, which was great.
14:41 masak git++
14:41 jonalv the same file has been changed in different ways in both branches and I only want to keep the changes from the branch anyway...
14:41 masak jonalv: you'd have the same problem with merge.
14:42 masak I think.
14:42 jonalv masak: no because I get all changes at the same time. It's easier to see
14:42 * egonw thinks so too
14:42 egonw jonalv: no
14:42 egonw of course not
14:42 masak jonalv: I don't think you want to use merge for that.
14:42 egonw git applies each patch separately
14:42 egonw no matter merge or rebase
14:42 jonalv egonw: no
14:42 jonalv egonw: not with svn
14:42 masak jonalv: yes, it really does.
14:42 jonalv not git svn
14:43 egonw anyway
14:43 masak jonalv: yes, even git-svn.
14:43 egonw if changes in one are irrelevant
14:43 masak jonalv: you just don't think it does.
14:43 egonw then
14:43 egonw just copy the files manually
14:43 jonalv it just takes the atest patch from both branches and merges them
14:43 egonw jonalv: no, don't think so
14:43 egonw not even pure svn does that
14:43 masak jonalv: you're thinking about the merge commit.
14:43 jonalv if it didn't things would be much more easy
14:44 masak jonalv: have you read "Git from the bottom up"?
14:44 jonalv masak: no, I guess you are saying that you have?
14:44 masak jonalv: twice. it's very good.
14:44 masak http://www.newartisans.com/2008​/04/git-from-the-bottom-up.html
14:44 zarah masak's link is also http://tinyurl.com/cf6fjv
14:44 jonalv masak: so tell me what to do then...
14:44 masak jonalv: read it.
14:45 masak jonalv: I can't learn for you.
14:45 jonalv masak: I don\t have the time...
14:45 masak jonalv: I don't have time to read it to you.
14:45 jonalv masak: I don't want you te read it to me I just want you to help me...
14:45 masak jonalv: you're being unhelpful when I want to help you.
14:45 masak jonalv: it's not that long.
14:46 masak and it will really help understanding.
14:46 jonalv so you are telling me that I have to do that evil merge that I get from the rebase?
14:46 masak jonalv: possibly, yes.
14:46 jonalv masak: but I don't know how to merge that conflict
14:46 masak ok.
14:46 jonalv I didn\t write the code charlgren did...
14:47 masak jonalv: I feel on many levels right now that you want me to solve problems I'm not even interested in solving.
14:47 jonalv masak: I thought you knew / wanted to learn git
14:47 masak jonalv: if you don't know how to merge some code, what do you expect me to do about it?
14:48 jonalv masak: I know how to merge the diffs between the trunk and the master. I have done that...
14:48 masak jonalv: I can help you with the git parts.
14:48 masak not with the 'how to sort out the code' parts.
14:48 jonalv masak: but you are telling me that I don't wanna do that
14:48 masak jonalv: from experience, yes.
14:48 masak did you read the email?
14:49 jonalv masak: and I am telling you that I don't know how to do what you are telling me that I want to do...
14:49 jonalv masak: probably yea, but when was this?
14:49 masak jonalv: ten minutes ago.
14:49 jonalv masak: if so then ono
14:49 masak read it.
14:49 jonalv I was busy talking to you...
14:49 jonalv oki
14:51 jonalv masak: what does PITA bread have to do with things?
14:51 masak jonalv: are you just making fun of me, or do you want to solve this?
14:52 * jonalv is confused
14:52 * jonalv doesn't know what PITA means
14:52 * jonalv is ashamed to admit this
14:52 masak Pain In THe Ass.
14:52 jonalv masak: but that discussion points in the direction as to saying that you can do it...
14:53 jonalv masak: what I wanna do that is...
14:54 masak jonalv: great. problem solved then, I guess.
14:54 jonalv masak: I still seem to have that old commit around although I deleted the branch :(
14:54 masak what old commit?
14:54 jonalv masak: the merge commit
14:54 jonalv masak: the one I wanted to undo when we started this discussion...
14:55 masak I thought that one was in the branch.
14:55 jonalv the one that makes it impossible for me to actually merge from the branch to trunk
14:55 jonalv masak: I thought that too
14:55 * jonalv is confused now...
14:55 masak maybe merging works the opposite direction from what you assume.
14:56 jonalv masak: maybe
14:56 jonalv what does: Merge branch 'master' into tabbed-masterplate-editorLOCAL
14:56 jonalv mean?
14:56 masak that the commits made in master since the branch point get put into the branch.
14:56 jonalv masak: yea that's what I thought...
14:57 masak probably you got it in master too because you merged back after that.
14:57 masak look, this is taking a lot of my time...
14:57 jonalv masak: mine too
14:57 masak and I sense a great deficiency in your knowledge of git basics.
14:58 masak please, please read the doc.
14:58 masak you won't regret it.
14:58 jonalv masak: I thought I knew this...
14:58 masak since, you're working with git, you might as well understand it.
14:58 jonalv it all makes sence when I hear about iut...
14:58 masak it's not that hard.
14:58 masak just a bit different from, say, svn.
14:59 jonalv masak: just one more question
14:59 masak yes?
14:59 jonalv masak: how do I uncommit?
14:59 masak jonalv: git reset --hard HEAD^
14:59 jonalv masak: does that effect the git repo?
15:00 * masak laughs
15:00 masak jonalv: yes, that's what it does.
15:00 masak nothing else.
15:00 jonalv masak: why do I feel that we are talking around eachother?
15:00 masak well, it sets your wc to HEAD^ too.
15:01 jonalv masak: that does nto work
15:01 masak jonalv: it's like asking "how do I shower?", getting the answer and then asking "will I get wet?"
15:01 jonalv masak: it says: HEAD is now at 34db90c Merge branch 'master' into tabbed-masterplate-editorLOCAL
15:01 masak jonalv: http://www.kernel.org/pub/softw​are/scm/git/docs/git-reset.html
15:01 zarah masak's link is also http://tinyurl.com/4zxanp
15:01 jonalv masak: that is the commit I wanna get rid of
15:01 masak jonalv: maybe try it again, then.
15:02 masak or do a 'git log' and pick the commit you want to reset to.
15:02 jonalv masak: please don't make fun of me when what you are saying is not working
15:02 masak again, be careful not to contradict upstream.
15:02 masak jonalv: please understand what you're doing instead of asking unnecessary questions.
15:04 jonalv masak: why do I see commits made on the branch when I am on the master?
15:04 masak jonalv: because you merged back to master?
15:04 jonalv masak: but I just managed to do a reset
15:05 masak jonalv: the pain you're feeling right now comes directly from merging out to a branch and then back to master.
15:05 masak jonalv: I advise you not to do it again.
15:05 masak jonalv: I think your safest bet is to save your work somewhere, and then do a clean git-svn checkout.
15:06 masak that should solve all your current issues.
15:06 jonalv masak: yea... but I wnna learn :)
15:06 masak jonalv: you're too deep in right now. it's easier just to start over, I think.
15:06 jonalv masak: that will take ages
15:07 masak jonalv: if you want to learn, why don't you read "Git from the bottom up"?
15:07 jonalv I thought I could jsut reset everything made locally
15:07 masak jonalv: no, it'd still be faster than muddling on from here.
15:07 masak jonalv: you have the wrong conception of what reset does, I think.
15:07 jonalv masak: perhaps...
15:07 masak well, actually, if you know where the latest 'git svn rebase' is, you can reset to that...
15:08 masak that's as far back as you can go without contradicting upstream.
15:08 jonalv masak: that's what I did
15:08 masak good.
15:08 egonw jonalv: you can also consider making a new local branch of the upstream SVN branch
15:08 egonw that should clean up stuff too
15:09 jonalv but I still have brnahc commits in the master it seems... :(
15:09 jonalv I thought this was easy...
15:09 jonalv But I sure that it would have been if we would have been in the same room...
15:09 egonw unfortunately, git-svn inherits some SVN limitations
15:09 jonalv IRC really makes a mess out of communication...
15:10 olass *morr* yes
15:20 CIA-55 bioclipse: jonalv * r9275 /bioclipse2/trunk/plugins/net.bioclipse.​usermanager/src/net/bioclipse/usermanage​r/dialogs/UserManagerLoginDialog.java: Layout of gui component
15:26 CIA-55 bioclipse: jonalv * r9276 /bioclipse2/trunk/plugins/net.bioclips​e.usermanager/src/net/bioclipse/userma​nager/dialogs/CreateUserDialog.java: Layout of gui component
15:29 jonalv masak: okey I am back, I think my git svn setup is broken somehow...
15:29 masak jonalv: sad to hear it.
15:29 jonalv masak: I have done a new git init
15:30 masak git svn init, you mean.
15:30 jonalv masak: uh myea :)
15:30 jonalv I ahve done a new git svn init
15:30 olass I ahve = Jahve?
15:30 jonalv and when I do git log on master I get commits in the branch too
15:30 jonalv olass: no
15:31 olass ok
15:31 jonalv olass: I ahve == I have
15:31 masak please stop using equals signs like that.
15:31 egonw masak: indeed
15:31 masak jonalv: I can't map what you just said about the clean checkout to anything in my experience.
15:31 egonw I ahve != I have
15:31 jonalv masak: tell that to the people who wrote JAva...
15:31 masak jonalv: they know it. you don't.
15:31 egonw java people would write at least:
15:31 egonw I ahve = I have
15:32 jonalv masak: could that be way I ahve such problems?
15:32 masak jonalv: no. I have no clue.
15:32 masak it sounds like action at a distance, what you're describing.
15:32 jonalv masak: but you who has read the texts agree that they shouldn't be there?
15:32 masak unless you happened to make a 'git svn dcommit', but I think we'd have noticed that.
15:32 masak jonalv: what you're describing does not make sense.
15:33 jonalv masak: no you would not have noticed that (it's brunn) but yes I have not done that
15:33 jonalv masak: my oppinion too
15:35 jonalv does git log show log for the entire svn repo when using git svn?
15:35 egonw only for the active branch
15:35 masak jonalv: it shows the log for the branch you're on.
15:36 masak the local git branch, that is.
15:36 egonw jonalv: but I managed to confuse abou t what branch is upstream too...
15:36 egonw so that your branch is messed up, that's what broken with the CDK branching too :)
15:37 jonalv egonw: how do you mean?
15:37 egonw git is not really fool proof...
15:37 egonw git-svn is even worse...
15:37 egonw I messed up branches in the past
15:37 egonw beyond repair...
15:38 egonw not sure what path you are following now...
15:38 egonw to solve things...
15:38 jonalv egonw: I am not doing anything yet
15:39 egonw jonalv: ok, then try this:
15:39 egonw git branch -r
15:39 egonw see what branch matches the branch in SVN
15:39 egonw say, it's called X
15:39 egonw then make a new local branch for that one...
15:40 egonw git checkout -b cleanupMess X
15:40 egonw then port the patches from your messed up branch
15:40 egonw after that, you can do a:
15:40 egonw git svn dcommit
15:40 egonw from the cleanupMess branch
15:40 egonw to at least bring SVN in synch with your work
15:40 jonalv egonw: ah
15:41 jonalv would you use rebase to poert the changes?
15:41 jonalv egonw: or merge?
15:41 egonw cherry-pick
15:41 egonw how many patches are there that you may want porting?
15:41 jonalv a couple
15:42 jonalv but didn;t we use interacitve rebase for that?
15:42 egonw dunno what you really did...
15:42 egonw I was not there
15:43 jonalv aha
15:43 * jonalv tries rebase
15:43 jonalv masak: says rebase is good
15:44 masak rebase is good.
15:44 jonalv hm I didn't mean to place a : there
15:44 masak ERC does that for you.
15:44 jonalv masak:  yea and I forgot to remove it...
15:44 masak yup.
15:45 * jonalv whishes he was at bmc
15:45 jonalv there is a load fan here. someone has taken my nice chair here.
15:45 jonalv |loud fan
15:50 jonalv egonw: reality check: "git diff master tabbed-masterplate-editor" (that is the VSN branch) should give me a long list of errors right? It gives me nothing...
15:52 egonw not sure
15:52 egonw put three periods between the branch names to list all changes since the branch
15:52 egonw git diff --help
15:52 egonw but not tried that ever
18:17 edrin left #bioclipse
19:27 jonalv -names

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