Camelia, the Perl 6 bug

IRC log for #bioperl, 2011-05-20

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

All times shown according to UTC.

Time Nick Message
03:09 svaksha left #bioperl
03:11 svaksha joined #bioperl
04:24 zenman joined #bioperl
06:15 dukeleto left #bioperl
06:16 dukeleto joined #bioperl
13:04 leprevost joined #bioperl
13:45 scottcain joined #bioperl
14:31 scottcain left #bioperl
14:34 dukeleto left #bioperl
14:35 dukeleto joined #bioperl
14:41 dukeleto left #bioperl
14:41 dukeleto joined #bioperl
15:15 zenman left #bioperl
16:31 sheenams joined #bioperl
16:52 scottcain joined #bioperl
16:59 leprevost left #bioperl
17:09 buelsbot joined #bioperl
17:31 dbolser I'm a bit confused why I have branches like dbolser/dbolser/debug_bp_seqfeature_delete showing up when I "git branch -r"
17:32 dbolser seems like a lot of branches in my forked remote are duplicates of branches in origin, but I'm not sure if that is a problem or not
17:33 rbuels dbolser: do you understand the distinction between local and remote branches?
17:33 dbolser sounds like a trick question, so I'll answer 'no'
17:33 jhannah distance?
17:33 dbolser I thought local branch was in the local index, and remote ... was in the remote index
17:34 dbolser some pairs are connected by 'tracking', but I don't know what that does really...
17:35 dbolser I just checked out a remote branch that didn't exist locally, and ended up 'detached HEAD'
17:35 dbolser I can say -b... but how do (or should I) track?
17:36 * dbolser reads man git-checkout
17:36 rbuels remote branches are basically cached copies of what remote repositories have in them
17:36 dbolser locally
17:37 rbuels yeah
17:37 dbolser ok
17:37 rbuels (these don't take up much space, since a branch is just a pointer into the directed graph of commits)
17:37 dbolser ok
17:38 dbolser I have a branch in my forked remote that has ... wait... do remotes have branches in that case?
17:38 scottcain left #bioperl
17:39 dbolser or are they just local pointers to cached remote commits?
17:39 dbolser gah
17:39 rbuels commits are commits
17:39 dbolser yes
17:39 rbuels no distinction between remote and local
17:39 dbolser right, but they are physically stored in both locations right?
17:39 rbuels git is a big bag of commits, with graph relationships between them.
17:39 dbolser yes
17:39 rbuels yes, they are stored in both.
17:39 dbolser now how bout branches?
17:39 rbuels a git clone is basically an rsync.
17:40 rbuels branches are stored in both locations too
17:40 dbolser ok, sorry about that
17:40 dbolser temporary wobble
17:40 rbuels but, with branches and tags, there is the distinction between remote and local
17:41 dbolser so, I have a branch on my forked remote that has been pulled into origin/master. Since then, origin/master has moved on, but I'd like to confirm that it now contains the commits on that branch so I can delete it and Move On {TM}
17:42 rbuels you want to confirm that origin/master contains the commits in the local master
17:42 dbolser rbuels: because remote branches/tags are just cached pointers rather than ... sorry, can you clarify the distinction?
17:42 rbuels all branches and tags are just pointers.
17:42 dbolser ok
17:42 rbuels it's just that you have your local set, and you also have caches of the sets in other repos.
17:43 rbuels (which is what git branch -r shows you)
17:43 dbolser rbuels: ok, I get it.
17:43 dbolser so just now I did a 'git pull --rebase dbolser' and a bunch of new remote branches turned up
17:44 dbolser i.e. I was syncing with the remote 'sets'
17:44 rbuels yeah
17:44 dbolser rbuels: the weird thing is, it seems to prefix all those branches with 'dbolser/'
17:44 rbuels yeah, that's the remote name.
17:45 rbuels you have a remote called dbolser.
17:45 dbolser and for some reason, many of those branches are in the dbolser remote as copies of branches in origin
17:45 rbuels it prefixes the names of remote branches with the name of the remote they belong to
17:45 rbuels well, the dbolser remote is a clone of oriign
17:45 dbolser rbuels: even when they are copies?
17:46 rbuels when you made your dbolser fork, all the branches came along too
17:46 dbolser rbuels: right... but somehow, there are branches in origin called 'dbolser/x'
17:46 * rbuels looks
17:46 dbolser so now I've got 'dbolser/dbolser/x', and I'm wondering if I'm doing something wrong
17:46 dbolser git pull --rebase origin
17:46 dbolser oops
17:47 rbuels i don't see any dbolser/ branches in the main bioperl-live repo
17:47 rbuels or, is origin your fork?
17:47 dbolser no, origin is 'the main' repo
17:47 rbuels yeah, looks like you have branches called dbsolser/* in your fork
17:48 dbolser git pull --rebase origin  # causes problems actually
17:48 dbolser hmm
17:48 rbuels git remote show origin.
17:48 * rbuels hypothesizes that dbolser's origin is not what he thinks it is
17:48 jhannah ? what problems does pull --rebase cause?
17:48 dbolser rbuels: you want me to paste that or understand it?
17:48 jhannah we do that all the time
17:48 dbolser CONFLICT
17:49 dbolser (not my emphasis ;-)
17:49 jhannah um, conflicts happen with or without --rebase
17:49 jhannah and/or i don't know what i'm talking about
17:49 dbolser but I thought I was already on origin/master
17:49 dbolser lemmy paste for rbuels
17:49 rbuels dbolser: you are never *on* a remote branch
17:50 rbuels if you try to check out a remote branch, it'll do it, but it's a detached head
17:50 rbuels er, on a detached head
17:50 dbolser I thought my index was up to date with origin and I was on local branch master
17:50 dbolser https://gist.github.com/f1d702b4d4de4956ce89
17:50 rbuels (meaning it's not going to save any pointer)
17:51 rbuels ok, i guess your origin actually is the main bioperl-live repo
17:51 dbolser just before that:
17:51 dbolser https://gist.github.com/0ba3c3341b38737be650
17:52 dbolser bah... must have pushed a tweek to that script when creating that branch
17:53 rbuels could be
17:53 dbolser OK, I think I can do this ;-)
17:55 dbolser U       scripts/Bio-SeqFeature-Sto​re/bp_seqfeature_load.PLS # But I don't see conflict markers anywhere
17:56 dbolser hrm... my doing
18:00 dbolser I seem to be going back in time
18:01 scottcain joined #bioperl
18:04 dbolser git rebase # suceeded
18:05 dbolser Your branch is ahead of 'origin/master' by 13 commits. ?
18:05 dbolser rbuels: so ... I'm nearly making progress...
18:06 dbolser I want to determine if my local copy of bioperl/master (origin/master) contains the commits in dbolser/dbolser_bio_coordinate_pair_tests
18:07 dbolser actually I have a local branch called 'dbolser_bio_coordinate_pair_tests'
18:07 dbolser dbolser_bio_coordinate_pair_tests       tracked
18:08 dbolser Local refs configured for 'git push':
18:08 dbolser dbolser_bio_coordinate_pair_tests pushes to dbolser_bio_coordinate_pair_tests (up to date)
18:08 dbolser fix_sf_store_dbi_mysql            pushes to fix_sf_store_dbi_mysql            (up to date)
18:09 dbolser master                            pushes to master                            (local out of date)
18:09 rbuels dbolser: well, if git diff origin/master...dbolser/dbols​er_bio_coordinate_pair_tests shows nothing, i think that means it has them
18:09 dbolser rbuels: but origin/master has moved on... ahh... but that is taken into account by .. yes?
18:09 rbuels dbolser: well, git branch also has a thing to show whether a branch has been merged
18:09 rbuels dbolser: notice the three dots.
18:09 rbuels dbolser: not two.
18:10 dbolser it's not showing nothing
18:10 dbolser --- /dev/null / +++ b/t/Coordinate/CoordinateBoundaryTest.t ...
18:10 dbolser i.e. the very thing I thought had been pulled.
18:10 dbolser but what about these 'out of date' warnings from git show on master in both remotes
18:10 rbuels dbolser: when was the last time you updated your cached copy of origin?
18:11 rbuels dbolser: git fetch origin.
18:11 rbuels (fetch == "update cached copy of remote")
18:11 dbolser rbuels: does "git pull --rebase origin" do that?
18:11 rbuels well, yeah it's supposed to
18:11 dbolser than I did that about 10 mins ago
18:12 dbolser should I try "git fetch"?
18:12 dbolser I'm supposed to go 'socalize' 30 mins ago...
18:12 dbolser in reality its an opportunity to anti-social'ize
18:12 rbuels eh, it's probably fetched
18:13 * rbuels looks at it himself
18:13 dbolser that branch?
18:13 dbolser sorry, I really should go
18:13 dbolser got to go shopping before bbq
18:14 rbuels oh, the reason it's showing a diff is because your commit was rebased onto master
18:14 dbolser anything I can do to help clarify the problem?
18:14 rbuels so it's not exactly the same commit
18:14 jhannah git is easy!
18:14 jhannah ;)
18:14 dbolser scottcain: close your ears
18:15 rbuels dbolser: so yes, your dbolser/dbolser_bio_coordinate_pair_tests is merged i think
18:15 rbuels not sure by dukeleto rebased it.
18:15 rbuels er, not sure why
18:15 rbuels oh, it was a cherry-pick, because you had stuff in that branch you didn't want us to merge
18:15 rbuels dbolser: remember?
18:16 * dbolser isn't sure what the precise distinction is, but takes some satisfaction in the fact that at least rbuels knows what is going on
18:16 rbuels dbolser: we just picked the coordinate pair tests out of it
18:16 dbolser I remember you telling him to squash it
18:16 dbolser and he said 'relax, I did it'
18:16 rbuels mm, i think that was a different one
18:16 dbolser oh
18:16 * rbuels doesn't really remember
18:16 dbolser I think it was that one
18:16 dbolser however, why is it missing ?
18:17 dbolser let me re-rebase on origin
18:17 rbuels no, don't rebase
18:17 dbolser sorry pull --rebase
18:17 dbolser ?
18:17 rbuels no, stop that
18:17 rbuels what is it you want.
18:17 dbolser clarity
18:17 rbuels well whatever it is, i can't deliver because i just don't see it
18:18 * rbuels looks around for glimmers of recognition
18:18 dbolser git status
18:18 dbolser # On branch master
18:18 dbolser # Your branch is ahead of 'origin/master' by 13 commits.
18:18 rbuels (frozen peas)
18:18 * dbolser rsyncs his repo onto sgn for rob to commense forensic analysis
18:18 rbuels dbolser: you like findus crispy pancakes?
18:18 dbolser not really
18:18 dbolser usually ham flavour...
18:18 dbolser I'm vegie
18:18 rbuels i heard they were going posh with lobster thermadore
18:18 dbolser heheh
18:19 dbolser why keep peas in a forensics lab?
18:19 * dbolser goes to his 'social' engagement
18:19 dukeleto rbuels: i didn't rebase anybody's branch
18:19 dbolser heh.. I hope people I know don't know how to search with google
18:19 dbolser see... he squashed it
18:20 dukeleto dbolser: git rebase origin/master will update and "fix" the Your branch is ahead of...
18:20 rbuels it wasn't the whole branch though
18:20 dukeleto pyrimidine: ping
18:20 rbuels there was a whole discussion about this
18:20 * rbuels bets he's on the way to NL
18:24 dbolser dukeleto: rbuels said no rebaseing
18:24 dbolser rbuels: what should I do?
18:24 * dbolser sends pyrimidine's plain back home so he can help
18:24 rbuels dbolser: go socialize
18:24 dbolser but my repo... is dirty!
18:24 rbuels dbolser: they might have lobster thermadore crispy pancakes
18:25 dbolser peraps... I;ll buy some and toast you with them
18:25 rbuels dbolser: and when you get back, just forget about that branch
18:25 dbolser dukeleto: git rebase origin/master # Current branch master is up to date.
18:25 dbolser bah
18:25 rbuels dbolser: git checkout master;  git reset --hard; git clean -fdx, and get on with your life
18:25 * rbuels chuckles
18:26 dbolser is that one of those 'rm -rf # ftn' kind of suggestions?
18:26 * dbolser goes ;-)
18:26 dbolser l8r
19:01 sheenams left #bioperl
19:49 takadonet left #bioperl
20:57 zenman joined #bioperl
21:01 pyrimidine left #bioperl
21:19 leprevost joined #bioperl
22:06 amir_ joined #bioperl
22:06 amir_ hello
22:06 amir_ is now known as Guest23151
22:06 Guest23151 hello
22:06 Guest23151 hi
22:06 Guest23151 any body
22:07 Guest23151 answer please
22:07 Guest23151 left #bioperl
22:16 leprevost left #bioperl
22:22 scottcain left #bioperl
22:23 scottcain joined #bioperl
23:28 perl_splut left #bioperl

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