You can merge from devel into release (as long as it's only bug fixes), but make sure you don't overwrite the version number. If the version number in release was 1.0.0 before the merge, make sure it is 1.0.1 before committing.
See https://www.bioconductor.org/developers/how-to/version-numbering/ for more. Dan ----- Original Message ----- > From: "Morganella Sandro" <morganella...@gmail.com> > To: "bioc-devel" <bioc-devel@r-project.org> > Sent: Thursday, March 3, 2016 1:39:08 AM > Subject: [Bioc-devel] SVN Commit - Problem with the Version Number > Dear All, > I have been working to fix an error on my package. So I have done the usual > steps: > (1) Download the package from the trunk repository > (2) Make my changes and update the version from (new version is now 3.9.44) > (3) I do the svn commit, and everything works fine > (4) Then I download and merge the release branch, and again everything > works fine > > Th problem is when I do the commit on the release branch. In particular I > get the following error: > > ---- > Transmitting file data ......svn: Commit failed (details follow): > svn: Commit blocked by pre-commit hook (exit code 1) with output: > The y in the x.y.z version number should be even in release > in file branches/RELEASE_3_2/madman/Rpacks/VegaMC/DESCRIPTION. > See http://bioconductor.org/developers/how-to/version-numbering/ > ---- > > Any idea how to fix this? > > Many Thanks, > Sandro > > [[alternative HTML version deleted]] > > _______________________________________________ > Bioc-devel@r-project.org mailing list > https://stat.ethz.ch/mailman/listinfo/bioc-devel _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
