[Bioc-devel] Git-svn: getting it to work while keeping your git history

2015-10-15 Thread Leonardo Collado Torres
Hi, Now that BioC 3.2 is released, I need a little bit of guidance on git-svn. I know that the bridges won't work anymore and my past attempt at the new git-svn setup was kind of a mess (see https://stat.ethz.ch/pipermail/bioc-devel/2015-June/007726.html). But I'm ready to give it another go.

Re: [Bioc-devel] Git-svn: getting it to work while keeping your git history

2015-10-15 Thread Jim Hester
Leo, You can use your current git repo, please don't delete it or your history! The most foolproof way of using git-svn with existing git history is to use `git cherry-pick` to pick commits to add to the `devel` branch rather than merging changes from the master branch. This will avoid including

Re: [Bioc-devel] Git-svn: getting it to work while keeping your git history

2015-10-15 Thread Leonardo Collado Torres
Jim, Thank you! This works perfectly!! It'd be great to have this information at http://bioconductor.org/developers/how-to/git-mirrors/ I realize now that you already had mentioned using "git cherry-pick" at https://stat.ethz.ch/pipermail/bioc-devel/2015-September/008013.html and Siddhartha

Re: [Bioc-devel] Git-svn: getting it to work while keeping your git history

2015-10-15 Thread Jim Hester
Yes I will try and update the current documentation to address this situation. When it was first written we (I?) was not aware of all the issues with prior history, merging and how best to handle them. On Thu, Oct 15, 2015 at 2:00 PM, Leonardo Collado Torres wrote: > Jim, > >