Re: [Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-29 Thread James Collins
Hi Martin: Thanks — I hadn’t thought of the ‘squash’ strategy before. Will give that a try next time. On a related note: I am concerned that my final commit to the release branch (version number bump to 1.2.1) did not trigger a new release build last night. Could this be related to the same

Re: [Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-29 Thread Martin Morgan
Should be back on track; again the problem is with multiple commits to svn in a short time. The solution is I think to do 'squash' commits from your git branch to the devel branch, and then to push the one squash commit rather than n individual commits. Martin On 06/28/2017 05:52 PM, James

[Bioc-devel] Git mirror out of sync (LOBSTAHS package)

2017-06-28 Thread James Collins
Hi all — Sorry for the trouble, but the LOBSTAHS Git mirror seems to be out of sync, both on the devel (master) and release-3.5 branches. I pushed a bunch of new commits to devel, and I had to push a few commits to release-3.5 as well to fix a bug identified by a user in the current release

Re: [Bioc-devel] Git mirror out of sync

2016-08-31 Thread Angerer, Philipp via Bioc-devel
Gesendet: Donnerstag, 11. August 2016 13:05:58 Betreff: Re: [Bioc-devel] Git mirror out of sync great, thanks! Von: "Martin Morgan" <martin.mor...@roswellpark.org> An: "Angerer, Philipp" <philipp.ange...@helmholtz-muenchen.de>, "bioc-devel" <

Re: [Bioc-devel] Git mirror out of sync

2016-08-11 Thread Angerer, Philipp via Bioc-devel
great, thanks! Von: "Martin Morgan" <martin.mor...@roswellpark.org> An: "Angerer, Philipp" <philipp.ange...@helmholtz-muenchen.de>, "bioc-devel" <bioc-devel@r-project.org> Gesendet: Donnerstag, 11. August 2016 12:54:50 Betreff: Re: [Bioc-dev

Re: [Bioc-devel] Git mirror out of sync

2016-08-11 Thread Martin Morgan
On 08/09/2016 04:18 AM, Angerer, Philipp via Bioc-devel wrote: Hi, destiny ’s git mirror has been out of sync for quite some time. The currently latest SVN revision has bumped the version to 1.3.4 , but git master is still on 1.3.0 . This should be back on track now, please let us know if

[Bioc-devel] Git mirror out of sync

2016-08-09 Thread Angerer, Philipp via Bioc-devel
Hi, destiny ’s git mirror has been out of sync for quite some time. The currently latest SVN revision has bumped the version to 1.3.4 , but git master is still on 1.3.0 . Thanks for looking at it, Philipp Helmholtz Zentrum Muenchen Deutsches Forschungszentrum fuer Gesundheit und