Camelia, the Perl 6 bug

IRC log for #bioperl, 2010-10-05

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

All times shown according to UTC.

Time Nick Message
00:13 philsf joined #bioperl
01:28 philsf left #bioperl
02:02 philsf joined #bioperl
03:34 philsf left #bioperl
04:31 dnewkirk left #bioperl
05:28 daniel__ left #bioperl
09:57 carandraug joined #bioperl
10:58 dbolser can anyone explain what pyrimidine just said?
10:58 dbolser you should be able to change the integration branch from bioperl:master to bioperl:topic/dbolser-biocoord_pair_tests.
10:58 dbolser is that like ... in my pull request?
11:00 dbolser You're asking  bioperl to pull 3 commits into bioperl:master from dbolser:dbolser_bio_coordinate_pair_tests ... seems I can submit a pull request to another branch of bp
11:02 kai I think so
11:02 dbolser also... another git question...
11:02 kai sure
11:02 dbolser my branch is already ~80 commits behind master
11:03 dbolser my debugging branch
11:03 dbolser should I merge those commits before re-submitting the pull request?
11:03 dbolser (in general)
11:04 kai in general I'd rebase
11:04 dbolser ok, so rebase takes my branch, 'rewinds' all my commits, applies all the 'pending' commits, and then adds all my commits in afterwards?
11:05 kai http://gist.github.com/43974​5#file_git_rebase_explained.txt
11:05 kai I've explained this before :)
11:06 kai but yeah, what you said
11:06 dbolser I thought I got it right this time, ... woo!
11:06 dbolser I wasn't after a lecture, just a double check ;-)
11:06 kai it's ASCII art
11:07 dbolser how come what I said isn't decernable in the phrase "Forward-port local commits to the updated upstream head"?
11:07 dbolser ;-)
11:08 dbolser cool, ty kai
11:10 dbolser kai: sorry, I wasn't bad mouthing your explaination, I just find that on the topic of git, people tend to get verbose. Your art is very clear now I have the basics
11:11 kai that's why I did ASCII art instead of writing yet another essay
11:13 dbolser is it always against master? just reading the manual and working out how to invoke it
11:14 dbolser --onto <newbase>
11:35 kai I just do "git rebase remote/branch"
11:35 kai usually that's origin/master, but sometimes it's a different branch
11:36 kai if you set up the branch to follow a specific other branch, "git pull --rebase" does the work of "git fetch; git rebase remote/branch" for you
11:57 dbolser ty kai
11:59 dbolser git rebase origin/master
11:59 dbolser Current branch dbolser_bio_coordinate_pair_tests is up to date.
11:59 dbolser false alarm ;-)
12:25 brandi1 joined #bioperl
12:26 kai dbolser: that's post-rebase, I think
12:26 kai what does "git status" say?
12:29 brandi1 left #bioperl
12:33 dbolser git status
12:33 dbolser # On branch dbolser_bio_coordinate_pair_tests
12:33 dbolser nothing to commit (working directory clean)
12:33 dbolser kai: looking at github, I'm 2 ahead, 0 behind
12:34 kai what git --version do you have?
12:35 dbolser omg http://www.youtube.com/watch?v=dehXioMIKg0
12:35 dbolser git version 1.5.5.6
12:37 kai ooh, I want a workshop like that!
12:37 kai dbolser: ah, that's a bit oldish. the git status output improved in the recent versions
12:37 kai but if you're two ahead and 0 behind, you're fine :)
12:38 dbolser :-) ty
12:38 dbolser are you on #hplusroadmap?
12:39 kai nope
13:15 dbolser its the link there... also in #bioinformatics now
15:00 ank joined #bioperl
15:31 philsf joined #bioperl
16:35 pyrimidine joined #bioperl
16:53 brandi1 joined #bioperl
16:56 brandi1 left #bioperl
16:56 brandi1 joined #bioperl
17:09 brandi1 left #bioperl
17:49 philsf left #bioperl
19:08 ank left #bioperl
19:09 ank joined #bioperl
19:09 ank left #bioperl
20:46 pyrimidine left #bioperl
20:52 dnewkirk joined #bioperl
21:03 philsf joined #bioperl
21:03 philsf left #bioperl
21:03 philsf joined #bioperl
21:15 philsf left #bioperl
21:23 carandraug left #bioperl
21:39 philsf joined #bioperl
22:37 philsf left #bioperl
22:38 philsf joined #bioperl
22:44 philsf left #bioperl
23:39 philsf joined #bioperl
23:39 philsf left #bioperl
23:39 philsf joined #bioperl

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