[Bioc-devel] destiny git mirror and SVN desynced

[Angerer, Philipp]

hmm, this is bad. now the release branch is OK, but there seems to be problem. 

when i do git svn rebase , i get this history: 


and a git reset origin/master sends me here: 


so the git mirror and the SVN seem to have permanently desynced… 

best, philipp 


Von: "Martin Morgan" <martin.morgan at roswellpark.org> 
An: "Angerer, Philipp" <philipp.angerer at helmholtz-muenchen.de>, "bioc-devel" <bioc-devel at r-project.org> 
Gesendet: Mittwoch, 14. Dezember 2016 16:02:04 
Betreff: Re: [Bioc-devel] destiny git mirror and SVN desynced 

On 12/14/2016 09:27 AM, Angerer, Philipp via Bioc-devel wrote: 
> hi, 
> 
> for my package “destiny”, the master and release-3.4 branches aren’t in sync between SVN and the gihub mirror. 
> 
> release-3.4 is just 2 commits behind, but the master branch has diverged. (a few commits have different hashs and a few are missing on the github mirror) 
> 
> this has been really unstable so far. do you plan to offer upstream repositories soon? 

yes; the current situation is unsatisfactory. 

Currently the cannonical repository is svn. The build system (and hence 
packages seen by the user) don't care about the mirror. Also, the mirror 
is in many ways confusing -- not the official repository, and not the 
developer repository. 

> 
> best regards, philipp 
> 
> 
> 
> 
> Helmholtz Zentrum Muenchen 
> 
> Deutsches Forschungszentrum fuer Gesundheit und Umwelt (GmbH) 
> 
> Ingolstaedter Landstr. 1 
> 
> 85764 Neuherberg 
> 
> www.helmholtz-muenchen.de 
> 
> Aufsichtsratsvorsitzende: MinDir'in Baerbel Brumme-Bothe 
> 
> Geschaeftsfuehrer: Prof. Dr. Guenther Wess, Dr. Alfons Enhsen 
> 
> Registergericht: Amtsgericht Muenchen HRB 6466 
> 
> USt-IdNr: DE 129521671 
> 
> 
> [[alternative HTML version deleted]] 
> 
> _______________________________________________ 
> Bioc-devel at r-project.org mailing list 
> https://stat.ethz.ch/mailman/listinfo/bioc-devel 
> 


This email message may contain legally privileged and/or confidential information. If you are not the intended recipient(s), or the employee or agent responsible for the delivery of this message to the intended recipient(s), you are hereby notified that any disclosure, copying, distribution, or use of this email message is prohibited. If you have received this message in error, please notify the sender immediately by e-mail and delete this email message from your computer. Thank you. 

 


Helmholtz Zentrum Muenchen

Deutsches Forschungszentrum fuer Gesundheit und Umwelt (GmbH)

Ingolstaedter Landstr. 1

85764 Neuherberg

www.helmholtz-muenchen.de

Aufsichtsratsvorsitzende: MinDir'in Baerbel Brumme-Bothe

Geschaeftsfuehrer: Prof. Dr. Guenther Wess, Dr. Alfons Enhsen

Registergericht: Amtsgericht Muenchen HRB 6466

USt-IdNr: DE 129521671