[Bioc-devel] git help

Hi Kevin,

I can help you with this. I can take you back to a state before August 18th and put that repository up on our Git server.

 From that point onwards you?d have to reapply all the changes on that repository from "commit ae93b1e9bcc574b5c8e9fc13b914286464ff4389" and onwards.

commit ae93b1e9bcc574b5c8e9fc13b914286464ff4389
Merge: 643e470 f1785fb
Author: tgirke <tgirke at citrus.ucr.edu>
Date:   Sat Aug 19 16:32:35 2017 -0700

     resolved conflicts

I can do this tomorrow and send you an email.


Best,

Nitesh

On Jan 3, 2018, at 4:28 PM, Kevin Horan <khoran at cs.ucr.edu> wrote:

Nitesh,

    I tried to re-construct the repo starting from what is left in the SVN repository, but I couldn't get all the branches to come over and it just generally looks too different to easily replace the bioc repo.

    I was thinking though, if its easy for you to clobber the current bioc repo for ChemmineR and re-create it from the old SVN repo (ie, because you might have scripts from having done it the first time), then that might be an easier fix. Then I can check it out, apply the recent changes and push it back.

    But if you don't think that's a good idea, then I'll take your offer of help and we can try to figure out how to get rid of the duplicate commits. Thanks.


Kevin


On 01/03/2018 11:55 AM, Turaga, Nitesh wrote:

Hi Kevin,

I?ll try to help you. I?ll take a look at your package and get back to you. Please forward this message to bioc-devel so that it?s public and other maintainers/users know that there is an issue with your package.

Best,

Nitesh

On Jan 3, 2018, at 2:31 PM, Kevin Horan <khoran at globalrecordings.net> wrote:

Nitesh,

    I am one of the maintainers for the ChemmineR package on bioconductor. I have a bad duplicate commit problem I was wondering if you could help me with. Basically, it seems one string of 1000 or so commits has been duplicated twice in the repository, so that there are now 3 copies of each of these commits. This mess is already in the bioconductor repository because in order to allow me to get some last minute changes in for the last release, someone at boic disabled the duplicate commit check for me. That was before I understood the extend of the problem.

    I'm not sure if its really your job to help with this sort of thing, as I understand that it's not a bioconductor problem. So if not that is fine. I've spent 6 hours trying to fix it myself ( and I am generally good with  GIT), but I've only succeeded in make more duplicates. So I think I'd need to toss all the history up to the last release, which I image I'd need your help to reset the repo on the bioc side as well.

    If you can help, there are more specifics I can give you, just let me know.

Thanks.


Kevin Horan

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.