Hi Andrew, How important are these “founding” commits? The new git server will also start from “A”, as they go off the SVN repo state.
The recommended practice will change once we move to the git server. I would not merge the branches, if they have unrelated histories. If it is possible to just go from the new git repo produced after the transition, that would be the ideal solution. Should be easy to port specific commits, on top of the git repo, after August 16th. Best, Nitesh > On Jul 28, 2017, at 2:09 PM, McDavid, Andrew > <andrew_mcda...@urmc.rochester.edu> wrote: > > Hi Nitesh, > > Schematically, my git repo started with commit D, while bioconductor's > started with A. It's possible this was because I did something wrong > managing the bioconductor repo, but since I can't rewrite history, there's > not anything I can do about that now. Their "founding" commits are distinct. > > > Bioconductor A---B---C > / / > Master D---E---F---G---I > > Since then, I have I have been cherry-picking changes from master onto > bioconductor per my understanding of recommended practice. > If I try to merge bioconductor onto master, or vice versa, I get the > unrelated histories warning. Vlad's suggestion works, but results in > replaying ~700 commits onto the bioconductor repo...not so nice maybe. > > The https://github.com/Bioconductor-mirror/MAST.git repo is to make SVN > commits from the git tree. > > >> On Jul 28, 2017, at 11:33 AM, Turaga, Nitesh <nitesh.tur...@roswellpark.org> >> wrote: >> >> I would be careful before using the --allow-unrelated-histories flag. Please >> investigate where there is a difference. >> >> Also, i don't understand why you are using the bioconductor-git-mirror? Your >> non-zero commit history should be related to bioconductor git server. >> >> Best >> >> Nitesh >> >> Get Outlook for Android >> >> >> >> From: Vladimir Kiselev >> Sent: Thursday, July 27, 5:11 PM >> Subject: Re: [Bioc-devel] git transition for projects with prior git history >> To: McDavid, Andrew, bioc-devel@r-project.org >> >> >> Hi Andrew, I solved it by just adding '--allow-unrelated-histories' to force >> the merge: >> https://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories >> Cheers, Vlad On Thu, Jul 27, 2017 at 9:53 PM McDavid, Andrew < >> andrew_mcda...@urmc.rochester.edu> 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 >> g...@git.bioconductor.org:packages/MAST > (fetch) > biocgit >> g...@git.bioconductor.org:packages/MAST > (push) > origin >> g...@github.com:RGLab/MAST.git (fetch) > origin >> g...@github.com:RGLab/MAST.git (push > > $ git fetch biocgit > $ git >> checkout -b bgMaster --track biocgit/master > ... > > ... > $ git merge >> master bgMaster > fatal: refusing to merge unrelated histories > > >> [[alternative HTML version deleted]] > > >> _______________________________________________ > Bioc-devel@r-project.org >> mailing list > https://stat.ethz.ch/mailman/listinfo/bioc-devel > -- >> http://genat.uk [[alternative HTML version deleted]] >> _______________________________________________ Bioc-devel@r-project.org >> mailing list https://stat.ethz.ch/mailman/listinfo/bioc-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. _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
