Re: [Bioc-devel] destiny git mirror and SVN desynced

2016-12-14 Thread Martin Morgan
On 12/14/2016 10:47 AM, James W. MacDonald wrote: On Wed, Dec 14, 2016 at 10:02 AM, Martin Morgan mailto:martin.mor...@roswellpark.org>> wrote: yes; the current situation is unsatisfactory. Currently the cannonical repository is svn. The build system (and hence packages seen by

Re: [Bioc-devel] destiny git mirror and SVN desynced

2016-12-14 Thread James W. MacDonald
On Wed, Dec 14, 2016 at 10:02 AM, Martin Morgan < martin.mor...@roswellpark.org> wrote: > >> > 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 > i

Re: [Bioc-devel] destiny git mirror and SVN desynced

2016-12-14 Thread Angerer, Philipp via Bioc-devel
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" An: "Angerer,

Re: [Bioc-devel] destiny git mirror and SVN desynced

2016-12-14 Thread Martin Morgan
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

[Bioc-devel] destiny git mirror and SVN desynced

2016-12-14 Thread Angerer, Philipp via Bioc-devel
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 u