Re: [Bioc-devel] Duplicate commit error on and off

This is good news! > On Oct 5, 2017, at 7:06 PM, Thomas Girke wrote: > > Thanks. I have synced everything to the current development and was able to > commit back to Bioc-upstream/master. > > Thomas > > On Thu, Oct 5, 2017 at 10:28 AM Turaga, Nitesh >

Re: [Bioc-devel] Duplicate commit error on and off

Done. If you clone from Bioconductor again, you should get a clean copy just as after the transition. If you have questions let me know. Best, Nitesh > On Oct 5, 2017, at 1:05 PM, Thomas Girke wrote: > > Yes, let's just do it this way. > > Thomas > > On Thu, Oct

Re: [Bioc-devel] Duplicate commit error on and off

Yes, let's just do it this way. Thomas On Thu, Oct 5, 2017 at 9:36 AM Turaga, Nitesh wrote: > It would be easier. I can do it and it would take you back to, > > commit c84c7b5fbdf1419af5030b66f8a759d29307f40b (git-svn) > Author: Herve Pages >

Re: [Bioc-devel] Duplicate commit error on and off

It would be easier. I can do it and it would take you back to, commit c84c7b5fbdf1419af5030b66f8a759d29307f40b (git-svn) Author: Herve Pages Date: Mon Apr 24 19:50:57 2017 + bump x.y.z versions to odd y after creation of 3_5 branch git-svn-id:

Re: [Bioc-devel] Duplicate commit error on and off

Where is your primary development repo on Github? Please send me link. Best, Nitesh > On Oct 4, 2017, at 10:14 AM, Turaga, Nitesh > wrote: > > Hi Thomas, > > The following issue occurred because there was a commit on Aug 17th with all > the duplicates.

Re: [Bioc-devel] Duplicate commit error on and off

Hi Thomas, The following issue occurred because there was a commit on Aug 17th with all the duplicates. Unfortunately, your upstream repository has been contaminated with duplicate commits. Till I figure out a solution on how to fix this, please hold off any further commits. I’ll keep you

Re: [Bioc-devel] Duplicate commit error on and off

The following allowed me to eliminate the duplicated commits in one step via git merge --squash and then successfully push back to the bioc-git server. After this I was able to switch to the swap branch approach to avoid similar problems in the future. Example here for master branch: git

Re: [Bioc-devel] Duplicate commit error on and off

Since our duplicate commits slipped through to Bioc (probably during pre-receive hook downtime), the only option I see, to actually get to the actual swap branch step, is to first fix the current duplicate problem in the upstream Bioc remote by resetting the affected branches back to the commit

Re: [Bioc-devel] Duplicate commit error on and off

Hi Thomas, Thanks for understanding. Swapping branches is the best solution I could come up with, and would advice you to go ahead with that. The catching of false positives was a couple of bugs in our pre-receive hooks code, which we have since fixed. I’m glad to have made the shift to Git,

Re: [Bioc-devel] Duplicate commit error on and off

Dear Martin and Nitesh, If swapping branches is the recommended solution then I will do so. The on/off situation with the duplicate commit error misled me to believe it is a temporary problem on the Bioc end. I am sorry for the extra noise my message may have caused. As a group that maintains

Re: [Bioc-devel] Duplicate commit error on and off

On 09/08/2017 09:34 AM, Turaga, Nitesh wrote: Hi Thomas, So, you do actually have a “duplicate” commit and you should NOT be pushing this to the bioc-git server. Notice that the body of both those commits is the same. If you want to check the rest of your commit history, please try `git log

Re: [Bioc-devel] Duplicate commit error on and off

Hi Thomas, So, you do actually have a “duplicate” commit and you should NOT be pushing this to the bioc-git server. Notice that the body of both those commits is the same. If you want to check the rest of your commit history, please try `git log - -oneline` . And you will see that you will

Re: [Bioc-devel] Duplicate commit error on and off

Sure, it’s pretty long but here it is: git show 8210e1e04e8dc6819b84820077293d8d61914cf5 commit 8210e1e04e8dc6819b84820077293d8d61914cf5 Author: Kevin Horan Date: Fri Jun 30 21:37:15 2017 + fix for RSQLite 2 git-svn-id:

Re: [Bioc-devel] Duplicate commit error on and off

Dear Thomas, Can you please send me the output of the two `git show` commands? > git show 8210e1e04e8dc6819b84820077293d8d61914cf5 > git show f514d35b793e1d9462b899bf3c76cc06ab4dcc91 I’ll need to take a look at those to advice accordingly. Best, Nitesh > On Sep 7, 2017, at 7:04 PM, Thomas