[sakai-core-team] Merging from github to svn?

[Matthew Jones]

Yeah, while I do currently trust the checkout from the github svn to
produce an accurate version of the current HEAD, it does look like it's
combining Pull requests into the same revision in the revision log. It's
probably something with the nature of git and how things aren't really in
order and how when you have a commit and a merged pull request it keeps
track of them differently.

That sounds like what you describe could be a good process going forward.

For simple patches, you can also take the patch file right from the pull
request and attempt to apply that to the svn branch.

For instance if you take this
https://github.com/sakaiproject/sakai/pull/29

And just put .patch on the end of the url
https://github.com/sakaiproject/sakai/pull/29.patch

It turns it into a patch file that you can apply with patch -p1 < 29.patch.
Can even use wget and download it, patch will even ignore all the junk on
the top.

Obviously not ideal, but hopefully there won't be too many patches (like at
least more than any previous release) we have to pull back into 10.x going
forward.

On Fri, Jan 9, 2015 at 5:36 PM, Sam Ottenhoff <ottenhoff at longsight.com>
wrote:

>
>
> On Fri, Jan 9, 2015 at 5:32 PM, Kirschner, Beth <bkirschn at umich.edu>
> wrote:
>
>> Has anyone tried back-porting recent changes in github to their sakai
>> msub repo? I'm seeing some strange discrepencies.
>>
>> If I type "svn log https://github.com/sakaiproject/sakai | head -200" to
>> look at some recent changes, and try to look at the actual files changed, I
>> get incorrect results. For example:
>>
>
>
> Same here. I no longer trust the Github SVN interface.
>
>
>> ??? Any idea what I might be doing wrong? I could always generate a diff
>> file from github and back-port that, but I was hoping to try directly
>> merging from github to svn if possible.
>>
>
>
> I think Github has a broken or incomplete SVN interface.  I wish we had a
> more elegant solution here for merging, but I can't figure out a smooth
> path.  Here is what I did earlier when I merged a couple of Git commits
> into 10.x:
>
> * Did a git init on my SVN repo and added Github as a remote
> * Did a git fetch upstream
> * git format-patch -1 366b7370b4bba036ebf7897dad7fa81705d101c5
> * git apply 0001-SAK-28949-updated-help-files-from-our-great-document.patch
>
> It's not too bad of a process but certainly not as elegant as I hoped it
> would be ............
>
>
>
>
>
>
> _______________________________________________
> sakai-core-team mailing list
> sakai-core-team at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/sakai-core-team
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-core-team/attachments/20150109/2733bd23/attachment.html