Skip to content

[Bioc-devel] git svn trouble on release branch

3 messages · Kyle Bemis, Leonardo Collado Torres, Jim Hester

Original
Kyle Bemis
# 
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
Leonardo Collado Torres
# 
Hi Kyle,

What I've done in your situation is to simply svn checkout the release
branch. Then copy the latest files from my local release code into it,
then use svn to push it to the Bioc-release trunk.

Here's an example using my `derfinder` package:

```bash
## Work somewhere where the 'derfinder' directory doesn't exist
cd ~/Desktop
## The following command creates the 'derfinder' directory
svn co https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_3_2/madman/Rpacks/derfinder
## Copy latest files from my local release

## Push back to svn
cd derfinder
svn commit -m "commit message"
```

This page https://www.bioconductor.org/developers/source-control/
might be helpful.

Cheers,
Leo
On Fri, Dec 18, 2015 at 1:43 PM, Kyle Bemis <kbemis at purdue.edu> wrote:
Jim Hester
# 
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 <kbemis at purdue.edu> wrote: