Re: [Bioc-devel] Problem pushing new versions of xcms via git svn dcommit

2017-01-03 Thread Rainer Johannes
Hi Steffen and Laurent, one problem with xcms is that the 'devel' branch on sneumann/xcms is the real 'master' branch. I would suggest to create a new branch on github, e.g. 'biocdevel' and to link that one to the BioC svn (means also that update_remotes.sh can not be user right away - the svn

Re: [Bioc-devel] Problem pushing new versions of xcms via git svn dcommit

2017-01-03 Thread Laurent Gatto
Hi Steffen, The usual Commit to git as normal, when you want to push your commits to svn 1. `git checkout devel` to switch to the devel branch. (use release-X.X for release branches) 2. `git svn rebase` to get the latest SVN changes. 3. `git merge master --log` to merge y

Re: [Bioc-devel] Problem pushing new versions of xcms via git svn dcommit

2017-01-03 Thread McDavid, Andrew
Hi Steffen, Option 2 worked for me recently with a repo that had previous git history. I think you after you run git branch --track biocmaster bioc/master You need to run git checkout biocmaster Then you may run git svn dcommit, which should just be a null op at this point. I will

[Bioc-devel] Problem pushing new versions of xcms via git svn dcommit

2017-01-02 Thread Steffen Neumann
Hi all, and a happy new year! I am experiencing a lot of frustration getting changes from github pushed to BioC svn, and that includes some fixes for build issues in packages depending on xcms. I have tried several options: 1) git svn checkout, git remote add, git merge and git svn dcommit. 2)