Kyle, Assuming the fix you want to apply to the release branch is https://github.com/kbemis/Cardinal/commit/93ca48aa105379e4b052b094690ba927d6ab6a6a You can use this procedure.
git clone https://github.com/kbemis/Cardinalcd Cardinal curl -O https://raw.githubusercontent.com/Bioconductor/mirror/master/update_remotes.sh chmod u+x update_remotes.sh ./update_remotes.sh git checkout release-3.2 git log master # lookup the sha (93ca48aa1053) git cherry-pick 93ca48aa1053# Fix the conflict in the NEWS file git cherry-pick --continue git svn dcommit If you have other changes you need to make in release that are not on your master branch simply commit them to the release-3.2 branch directly and forgo the cherry-picking. Hope this helps! Jim On Fri, Dec 18, 2015 at 2:16 PM, Kyle Bemis <kbe...@purdue.edu> wrote: > Hi Jim, > > I’m trying to update the Cardinal package, and the Github repo is at > https://github.com/kbemis/Cardinal. > > Kyle > > ---- > > Kyle Bemis > Statistics Department > Purdue University > (317) 690-0847 > > On Dec 18, 2015, at 2:01 PM, Jim Hester <james.f.hes...@gmail.com> wrote: > > Kyle, > > You will need to provide more details, particularly what Bioconductor > package you are trying to update and where the existing GitHub repository > is located. > > The “Unable to determine SVN information from working tree history” > errors suggest the remotes were not setup properly for the repository. > > Please provide the above information and we can try to help. > > Jim > > On Fri, Dec 18, 2015 at 1:43 PM, Kyle Bemis <kbe...@purdue.edu> wrote: > >> Dear all, >> >> I’m working from a prior-existing Github repo, and trying to commit a bug >> fix to the release-3.2 branch, and git svn is only giving me errors. >> >> Trying 'git svn info' or 'git svn rebase’ only gives me “Unable to >> determine SVN information from working tree history” >> >> The potential fixes I’ve found suggest cherry picking commits on the >> master/devel branch, but I only need to commit to the release-3.2 branch. >> Everything *looks* in sync on the release branch, so I don’t know if I need >> to clean up the master/devel branch too (which sounds like it will be a >> pain) just to get things working for the release branch. I’m not sure what >> I should be doing here. >> >> Any suggestions? >> >> Thank you, >> Kyle >> >> ---- >> >> Kyle Bemis >> Statistics Department >> Purdue University >> (317) 690-0847 >> >> >> [[alternative HTML version deleted]] >> >> _______________________________________________ >> Bioc-devel@r-project.org mailing list >> https://stat.ethz.ch/mailman/listinfo/bioc-devel > > > > [[alternative HTML version deleted]] _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
