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

[Kirschner, Beth]

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:

##
## This should be a set of kernel files, but it's not
##
% svn log -v -r38242 https://github.com/sakaiproject/sakai
------------------------------------------------------------------------
r38242 | adrian.fish | 2015-01-09 05:00:16 -0500 (Fri, 09 Jan 2015) | 3 lines
Changed paths:
   M /trunk/sitestats/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/StatsAggregateJobImpl.java

Merge pull request #24 from adrianfish/KNL-1305

KNL-1305 Fixed comparator in BaseGroup.


## 
## This should be a set of msgcntr files, but it's not
##
% svn log -v -r 38233 https://github.com/sakaiproject/sakai
------------------------------------------------------------------------
r38233 | beth.kirschner | 2015-01-06 12:37:38 -0500 (Tue, 06 Jan 2015) | 3 lines
Changed paths:
   M /trunk/message/message-util/util/src/java/org/sakaiproject/message/util/BaseMessage.java
   A /trunk/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiConfiguration.java
   M /trunk/webservices/cxf/src/resources/applicationContext.xml

Merge pull request #17 from pushyamig/master

SAK-28088 Add associated gb item id to Forums feed


??? 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.

Thanks!
- Beth