Hi - I successfully updated my devel PoTRA package recently, now I am trying to push these same changes to the stable PoTRA package. I am encountering the following issue (see highlight below). Note - in the github PoTRA repo, I have pulled and merged from head --> RELEASE_3_13. Also the devel commit never had a problem with my version bump.
>>>> git checkout master Already on 'master' Your branch is up to date with 'origin/master'. >>>> git checkout RELEASE_3_13 Switched to branch 'RELEASE_3_13' Your branch is up to date with 'origin/RELEASE_3_13'. >>>> git push upstream RELEASE_3_13 Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 641 bytes | 641.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Error: Illegal version bump from '1.8.0' to '1.9.1'. remote: remote: Check http://bioconductor.org/developers/how-to/version-numbering/ remote: for details. remote: To git.bioconductor.org:packages/PoTRA.git ! [remote rejected] RELEASE_3_13 -> RELEASE_3_13 (pre-receive hook declined) error: failed to push some refs to 'git.bioconductor.org:packages/PoTRA.git' Thanks, Margaret On Wed, Jul 14, 2021 at 9:01 AM Kern, Lori <lori.sheph...@roswellpark.org> wrote: > In your steps you were good when you checked out RELEASE_3_13 > > So after git checkout RELEASE_3_13 > > apply the changes you did to fix master. You can do this manually or you > investigate how to use git cherry-pick > > When you have changed the files remember to do a git commit that includes > the version bump in the DESCRIPTION > > You should push those changes with a git push upstream RELEASE_3_13 > > Please ask further questions on bioc-devel so other members of the team > can also assist. > > Cheers, > > Lori Shepherd > > Bioconductor Core Team > > Roswell Park Comprehensive Cancer Center > > Department of Biostatistics & Bioinformatics > > Elm & Carlton Streets > > Buffalo, New York 14263 > ------------------------------ > *From:* margaret linan <scigenom...@gmail.com> > *Sent:* Wednesday, July 14, 2021 11:55 AM > *To:* Kern, Lori <lori.sheph...@roswellpark.org> > *Subject:* Re: [Bioc-devel] Updating stable release > > Hi Lori, > > I followed the instructions, but it seems that everything is up-to-date > already, I also didn't see anything pushed to RELEASE_3_13. Here are my > steps. > > >>>> git fetch --all > Fetching origin > Fetching upstream > > >>>> git checkout RELEASE_3_13 > Switched to a new branch 'RELEASE_3_13' > Branch 'RELEASE_3_13' set up to track remote branch 'RELEASE_3_13' from > 'upstream'. > > >>>> git merge upstream/RELEASE_3_13 > Already up to date. > > >>>> git merge origin/RELEASE_3_13 > merge: origin/RELEASE_3_13 - not something we can merge > > >>>> git checkout master > Switched to branch 'master' > Your branch is up to date with 'origin/master'. > > >>>> git checkout -b RELEASE_3_13 upstream/RELEASE_3_13 > fatal: A branch named 'RELEASE_3_13' already exists. > > >>>> git checkout master > Already on 'master' > Your branch is up to date with 'origin/master'. > > >>>> git push upstream RELEASE_3_13 > Everything up-to-date > > >>>> git push origin RELEASE_3_13 > Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 > remote: > remote: Create a pull request for 'RELEASE_3_13' on GitHub by visiting: > remote: https://github.com/PoTRA-Package/PoTRA/pull/new/RELEASE_3_13 > <https://secure-web.cisco.com/1uPco2QvExmLvEqxLsKb3C9tX1OizxdOi1dYfLagdQZXjtu2Ye_OFvo9Gt_SINdBynMZM_YiIsc25aGOnlsZlZ3JToY54VUPz4-nfYIJjjV_rQadro327xvnfCleDCAGOngTyw2B46GkscVAiv5mtmvx1pgxaIF4dJMQiU7jfMDGy-yVU3GhfXxjw2CzEpo9_ifAXV4zor7AUdJNhDovKaGRwy1Pze3n3vK24R-h8sK2D9emGrY79mD9qKHcmWyqL9KoxNcDddh_xCirS3DXCG6TkfRBuBXDuwYT-emKtz7EII4HhQluBIIQzoPGueOP-/https%3A%2F%2Fgithub.com%2FPoTRA-Package%2FPoTRA%2Fpull%2Fnew%2FRELEASE_3_13> > remote: > To https://github.com/PoTRA-Package/PoTRA.git > <https://secure-web.cisco.com/1d7OsrQ8hpFDIN1vh-nS5CRKMzSmBwJhs8qvMUUz6zodHt-U2W4NAQDw90m40atCEGnQn7jJEuQuzsd_iEDShFaG__hZZ-_YS4OM9muYX6Xqu3z-W9IvUJQwvz7xK6ZOJuSze5Lx3mySrfJZKPArdWFb0suzPjhJ3ydOMXmGj_ToDNW2MJAjTDyXsq1hU0MnBIBTANCG1aUgSQdk9Ke96IoG3SrpzTxx_Mj1X8owqEZpTD-5SZ71UuR1g4LcBHS5JOMbK94C_OS-MrvmBWnQLThEUE2Vi__vppCL_ug1hghoaINyZTy2NWvQTWlE05Dot/https%3A%2F%2Fgithub.com%2FPoTRA-Package%2FPoTRA.git> > * [new branch] RELEASE_3_13 -> RELEASE_3_13 > > >>>> git checkout RELEASE_3_13 > Switched to branch 'RELEASE_3_13' > Your branch is up to date with 'upstream/RELEASE_3_13'. > > >>>> git push upstream RELEASE_3_13 > Everything up-to-date > > >>>> git push origin RELEASE_3_13 > Everything up-to-date > > Thanks, > Margaret > > On Wed, Jul 14, 2021 at 8:40 AM Kern, Lori <lori.sheph...@roswellpark.org> > wrote: > > http://bioconductor.org/developers/how-to/git/bug-fix-in-release-and-devel/ > <http://secure-web.cisco.com/1idyf-X_lfOHqk5bL4oOYcN1Vquo3KhfjrrgQAhyfH-oF7MS-Z3nvagunSXuQ4_xrAkGaHxHEa9isIbfphU3AOepnL-9F4r1JktiK_wLe-hgCFZw9suExoAyxhmPCFI4QOWacyMUZ9r_WF43O-fnCWJCoi26ollnN1ET45Ay7kr9e0r8b_McNEL2TsYTfyJdn9hyEhUjEP2Xm7TfhlvCcXzyiVgRuClk3WNdlQDg2NEyuy3SMhbdVB6Zg_okr9AsqsDD3qZQtgtm6wSMD7XhHyqi7YIToKKeViensm2uN0STqGNHyLVB65pbvT_g5Wigk/http%3A%2F%2Fbioconductor.org%2Fdevelopers%2Fhow-to%2Fgit%2Fbug-fix-in-release-and-devel%2F> > > follow these instructions using RELEASE_3_13 instead of RELEASE_X_Y > > > > Lori Shepherd > > Bioconductor Core Team > > Roswell Park Comprehensive Cancer Center > > Department of Biostatistics & Bioinformatics > > Elm & Carlton Streets > > Buffalo, New York 14263 > ------------------------------ > *From:* margaret linan <scigenom...@gmail.com> > *Sent:* Wednesday, July 14, 2021 11:38 AM > *To:* Kern, Lori <lori.sheph...@roswellpark.org> > *Subject:* Re: [Bioc-devel] Updating stable release > > Hi Lori, > > I pushed it to the master branch only, how do I push the changes to the > RELEASE_3_13 branch? > > Thank you, > Margaret > > On Wed, Jul 14, 2021 at 8:37 AM Kern, Lori <lori.sheph...@roswellpark.org> > wrote: > > > Did you push your changes to the RELEASE_3_13 branch in addition to the > master branch? > > > > Lori Shepherd > > Bioconductor Core Team > > Roswell Park Comprehensive Cancer Center > > Department of Biostatistics & Bioinformatics > > Elm & Carlton Streets > > Buffalo, New York 14263 > ------------------------------ > *From:* Bioc-devel <bioc-devel-boun...@r-project.org> on behalf of > margaret linan <scigenom...@gmail.com> > *Sent:* Wednesday, July 14, 2021 11:32 AM > *To:* bioc-devel <bioc-devel@r-project.org> > *Subject:* [Bioc-devel] Updating stable release > > Hi Bioc, > > I recently fixed the build errors for my devel version of PoTRA and the > build is succeeding. However, the stable release of PoTRA still displays > "build error". What can I do to fix this? > > Thanks, > Margaret > > [[alternative HTML version deleted]] > > _______________________________________________ > Bioc-devel@r-project.org mailing list > > https://secure-web.cisco.com/1MjHER5J16z9_d79aB1UjYTOA-aqM1-hcwAiIa65Nh6z9V8ncDWWq42upQjOp_7nnMelfzyx_snS4AdFLwPx6mdYjxgxh5DLKn81z0EPuxwX4DXPsVhomsQ8f6eu_2U0KG-QgyuXCUVlk2PN3OcxhcV1IGZZ4yA2CFZt6hxe45YlmC5zF8c9BU8OVYHh7GHJNGUaNILop-oLP43__pB-qwkoVQHzIpcEilNgHqdXSK4gH-Nl-AcEflQ0YP_Ks0bxUxsgx-Aj95gHESXByRJ9pt58CU6jBa3stCvFxX5RtQo9oDhsvUfS3OiD33bNqRwZL/https%3A%2F%2Fstat.ethz.ch%2Fmailman%2Flistinfo%2Fbioc-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. > > > 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. > > > 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. [[alternative HTML version deleted]] _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel