thanks Martin!

Now everything is in sync again. You're right, the git commits were commited as 
separate svn commits; an alternative would be to use `git-merge --squash`, but 
I didn't try that one; so far I used `git cherry-pick` to merge a selected 
range of git commits into the devel branch (which is in sync with BioC svn) as 
I did have nasty merge conflicts doing a `git merge master`.

jo


> On 21 Sep 2016, at 13:38, Martin Morgan <martin.mor...@roswellpark.org> wrote:
> 
> On 09/21/2016 12:01 AM, Rainer Johannes wrote:
>> Dear all,
>> 
>> I recently observed that the svn and the github mirror of `ensembldb` is out 
>> of sync. Is this something specific to `ensembldb` or is this a general 
>> problem? Is there anything I could do to fix this?
>> 
> 
> I think it is up-to-date now? I think the problem is when several svn commits 
> occur in quick succession, and the second tries to sync the git repository 
> while the first is still working. I guess the common case is when you're 
> working on a git repo and merge it to svn in a way that retains the discrete 
> git commits as svn commits.
> 
> Each commit triggers this script
> 
>  https://github.com/Bioconductor/mirror/blob/master/update_git.py
> 
> and these lines (usually the second?) fail
> 
>  https://github.com/Bioconductor/mirror/blob/master/update_git.py#L87
>  https://github.com/Bioconductor/mirror/blob/master/update_git.py#L90
>  https://github.com/Bioconductor/mirror/blob/master/update_git.py#L93
> 
> leaving the local git repository in a condition that requires manual clean-up.
> 
> I guess this requires a more sophisticated implementation, where the svn 
> commit adds a task to a time-ordered queue, and the queue waits until each 
> previous step has been complete.
> 
> Martin
> 
>> thanks, jo
>> 
>> _______________________________________________
>> 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.

_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel

Reply via email to