[Bioc-devel] git transition for projects with prior git history

[Stephanie M. Gogarten]

I tried following the instructions in scenario 9 after adding a remote:
$ git remote add upstream https://git.bioconductor.org/packages/GENESIS.git
$ git fetch --all
Fetching origin
Fetching upstream
warning: no common commits

When I merge both upstream and origin, I see all my commits in 
duplicate: one from my original repo, and one from Bioconductor.

My repo has a rather complicated history: original author forked from 
the Bioc mirror, I forked from his repo, submitted a pull request, he 
pushed those changes back to SVN. Later I took over maintenance, set the 
Bioc mirror as a remote, and pushed my changes directly using git 
cherry-pick.

I'm guessing that the only reasonable path forward here is to just 
delete the current repo and start over after the transition, but I'm 
wondering if anyone else has seen the "no common commits" message, or 
has any other ideas.

thanks,
Stephanie

On 7/27/17 1:52 PM, McDavid, Andrew wrote:
> Is there a recommended recipe to utilize the git.bioconductor.org<http://git.bioconductor.org> remote with an existing git repo that has non-zero history?  I tried adding the git.bioconductor.org<http://git.bioconductor.org> as a remote, making a branch, and then checking out a branch on that remote, but it gave my computer sad.  Do I need to clone a new repo instead?
> 
> Example:
> $ git remote -vv
> bioc https://github.com/Bioconductor-mirror/MAST.git (fetch)
> bioc https://github.com/Bioconductor-mirror/MAST.git (push)
> biocgit git at git.bioconductor.org<mailto:git at git.bioconductor.org>:packages/MAST (fetch)
> biocgit git at git.bioconductor.org<mailto:git at git.bioconductor.org>:packages/MAST (push)
> origin git at github.com<mailto:git at github.com>:RGLab/MAST.git (fetch)
> origin git at github.com<mailto:git at github.com>:RGLab/MAST.git (push
> 
> $ git fetch biocgit
> $ git checkout -b bgMaster --track biocgit/master
> ...
> <some commits to master>
> ...
> $ git merge master bgMaster
> fatal: refusing to merge unrelated histories
> 
> 	[[alternative HTML version deleted]]
> 
> _______________________________________________
> Bioc-devel at r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel
>