[Bioc-devel] git-svn bridge: Track devel and release in different branches of same repo

[Julian Gehring]

Hi Ilari and Robert,

Thanks for your suggestions.  The setup that Ilari described works fine 
and is easy to setup, which is why I went with this now.  In the long 
term, it would still be nice to track release and devel in the same repo.

Best wishes
Julian


On 15.05.2014 16:02, Robert M. Flight wrote:
> Another option is to set up a local git repo that uses git branches to
> keep track of the svn branches. I have previously done this, and explain
> my setup here:
> http://robertmflight.blogspot.com/2012/04/bioconductor-git-and-svn-multiple.html
>
> However, I have found myself pushing updates to release so infrequently
> that it seems more of a pain than anything, and have been planning to
> implement something along the lines of what Ilari describes so that
> "release" can be updated if necessary.
>
> Cheers,
>
> -Robert
>
> Robert M Flight, PhD
> Bioinformatics PostDoctoral Scholar
> Resource Center for Stable Isotope Resolved Metabolomics
> Markey Cancer Center
> University of Kentucky
> Lexington, KY
>
> Twitter: @rmflight <https://twitter.com/rmflight>
> Web: rmflight.github.io <http://rmflight.github.io/>
> EM rflight79 at gmail.com <mailto:rflight79 at gmail.com>
> PH 502-509-1827 <tel:502-509-1827>
>
> The most exciting phrase to hear in science, the one that heralds new
> discoveries, is not "Eureka!" (I found it!) but "That's funny ..." -
> Isaac Asimov
>
>
>
>
>
> On Thu, May 15, 2014 at 6:31 AM, Ilari Scheinin
> <ilari.scheinin at gmail.com <mailto:ilari.scheinin at gmail.com>> wrote:
>
>      > Are there plans for the awesome git-svn bridge to allow the
>     tracking of devel and releases in different branches of the same git
>     repository? Currently, one has to create different repos for devel
>     and release (see http://bioconductor.org/developers/how-to/git-svn/).
>
>     I agree that the possibility to track specific branches would be a
>     useful feature, but in case somebody has overlooked this
>     possibility, I thought I’d share my setup.
>
>     Git lets you to push a local branch to remote branch with a
>     different name. So, in my main GitHub repository (QDNAseq), I have
>     two branches: master and release (+ possibly others for developing a
>     specific feature, etc). All development happens in this repository
>     (or its local clone to be exact), and this allows one to easily
>     cherry pick commits from development (master) to be included in the
>     release version.
>
>     And as required by the current bridge implementation, I also have a
>     separate GitHub repository (QDNAseq-release) with a bridge set up to
>     the release Bioconductor. This repository has only one branch
>     (master), and I keep no local copy of it at all. When needed, I just
>     push the QDNAseq/release branch to QDNAseq-release/master. Apart
>     from the initial setup of the repository and the bridge, this one
>     extra push is everything that is needed.
>
>     Of course, it’s a bit more error prone (one might forget to do the
>     extra push, or could end up accidentally pushing QDNAseq/master to
>     QDNAseq-relase/master), but it’s enough to make me fairly
>     indifferent to the branch limitation of the bridge.
>
>     Ilari
>
>
>     On 14.5.2014, at 15.26, Julian Gehring <julian.gehring at embl.de
>     <mailto:julian.gehring at embl.de>> wrote:
>
>      > Hi,
>      >
>      > Are there plans for the awesome git-svn bridge to allow the
>     tracking of devel and releases in different branches of the same git
>     repository? Currently, one has to create different repos for devel
>     and release (see http://bioconductor.org/developers/how-to/git-svn/).
>      >
>      > Best wishes
>      > Julian
>      >
>      > _______________________________________________
>      > Bioc-devel at r-project.org <mailto:Bioc-devel at r-project.org>
>     mailing list
>      > https://stat.ethz.ch/mailman/listinfo/bioc-devel
>
>     _______________________________________________
>     Bioc-devel at r-project.org <mailto:Bioc-devel at r-project.org> mailing list
>     https://stat.ethz.ch/mailman/listinfo/bioc-devel
>
>