AUTHZ
svn export -r 36116 https://source.sakaiproject.org/svn/authz/trunk authz-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/authz vendor/current-trunk authz-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/authz/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R36116 -m 'tagging authz vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/authz/trunk authz-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/authz/tags/trunk-R36116 authz-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' authz-trunk-workingcopy
- Resolved Conflicts
- authz-trunk-workingcopy/authz-impl/.classpath
- authz-trunk-workingcopy/authz-impl/pack/src/webapp/WEB-INF/components.xml
COMPONENT
svn export -r 36116 https://source.sakaiproject.org/svn/component/trunk component-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/component vendor/current-trunk component-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/component/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R36116 -m 'tagging component vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/component/trunk component-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/component/tags/trunk-R36116 component-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' component-trunk-workingcopy
- Resolved Conflicts
- component-trunk-workingcopy/component-impl/.classpath
COURSE-MANAGEMENT
svn export -r 36116 https://source.sakaiproject.org/svn/course-management/trunk course-management-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/course-management vendor/current-trunk course-management-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/course-management/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R36116 -m 'tagging course-management vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/course-management/trunk course-management-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/course-management/tags/trunk-R36116 course-management-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' course-management-trunk-workingcopy
- Resolved Conflicts
- course-management-trunk-workingcopy/cm-impl/hibernate-pack/src/webapp/WEB-INF/components.xml
DAV
svn export -r 36116 https://source.sakaiproject.org/svn/dav/trunk dav-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/dav vendor/current-trunk dav-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/dav/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R36116 -m 'tagging dav vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/dav/trunk dav-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R36116 dav-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' dav-trunk-workingcopy
- Resolved Conflicts
- dav-trunk-workingcopy/.classpath
GRADEBOOK
svn export -r 36116 https://source.sakaiproject.org/svn/gradebook/trunk gradebook-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/gradebook vendor/current-trunk gradebook-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R36116 -m 'tagging gradebook vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/trunk gradebook-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R32756 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R36116 gradebook-trunk-workingcopy svn commit -m 'Applied vendor branch modification R32756:R36116 (trunk)' gradebook-trunk-workingcopy
- Resolved Conflicts
- gradebook-trunk-workingcopy/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java
- gradebook-trunk-workingcopy/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
HELP
svn export -r 36116 https://source.sakaiproject.org/svn/help/trunk help-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/help vendor/current-trunk help-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/help/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 -m 'tagging help vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/help/trunk help-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 help-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' help-trunk-workingcopy
- Resolved Conflicts
- help-trunk-workingcopy/.classpath
JOBSCHEDULER
svn export -r 36116 https://source.sakaiproject.org/svn/jobscheduler/trunk jobscheduler-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler vendor/current-trunk jobscheduler-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R36116 -m 'tagging jobscheduler vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/trunk jobscheduler-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/jobscheduler/tags/trunk-R36116 jobscheduler-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' jobscheduler-trunk-workingcopy
- Resolved Conflicts
- none
LOGIN
svn export -r 36116 https://source.sakaiproject.org/svn/login/trunk login-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/login vendor/current-trunk login-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/login/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R36116 -m 'tagging login vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/login/trunk login-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/login/tags/trunk-R36116 login-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' login-trunk-workingcopy
- Resolved Conflicts
- login-trunk-workingcopy/login-tool/.classpath
MASTER
svn export -r 36116 https://source.sakaiproject.org/svn/master/trunk master-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/master vendor/current-trunk master-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/master/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R36116 -m 'tagging master vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/master/trunk master-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/master/tags/trunk-R36116 master-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' master-trunk-workingcopy
- Resolved Conflicts
- none
PORTAL
svn export -r 36116 https://source.sakaiproject.org/svn/portal/trunk portal-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/portal vendor/current-trunk portal-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/portal/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R36116 -m 'tagging portal vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/portal/trunk portal-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/portal/tags/trunk-R36116 portal-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' portal-trunk-workingcopy
- Resolved Conflicts
- portal-trunk-workingcopy/portal-impl/.classpath
- portal-trunk-workingcopy/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java
PROVIDERS
svn export -r 36116 https://source.sakaiproject.org/svn/providers/trunk providers-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/providers vendor/current-trunk providers-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/providers/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R36116 -m 'tagging providers vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/providers/trunk providers-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/providers/tags/trunk-R36116 providers-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' providers-trunk-workingcopy
- Resolved Conflicts
- providers-trunk-workingcopy/.classpath
REFERENCE
svn export -r 36116 https://source.sakaiproject.org/svn/reference/trunk reference-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/reference vendor/current-trunk reference-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/reference/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R36116 -m 'tagging reference vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/reference/trunk reference-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/reference/tags/trunk-R36116 reference-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' reference-trunk-workingcopy
- Resolved Conflicts
- none
RWIKI
svn export -r 36116 https://source.sakaiproject.org/svn/rwiki/trunk rwiki-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/rwiki vendor/current-trunk rwiki-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R36116 -m 'tagging rwiki vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/trunk rwiki-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/rwiki/tags/trunk-R36116 rwiki-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' rwiki-trunk-workingcopy
- Resolved Conflicts
- none
SAM
svn export -r 36116 https://source.sakaiproject.org/svn/sam/trunk sam-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/sam vendor/current-trunk sam-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/sam/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R36116 -m 'tagging sam vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/sam/trunk sam-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/sam/tags/trunk-R36116 sam-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' sam-trunk-workingcopy
- Resolved Conflicts
- none
SITE
svn export -r 36116 https://source.sakaiproject.org/svn/site/trunk site-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/site vendor/current-trunk site-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/site/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R36116 -m 'tagging site vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/site/trunk site-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/site/tags/trunk-R36116 site-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' site-trunk-workingcopy
- Resolved Conflicts
- site-trunk-workingcopy/site-impl/.classpath
SITE-MANAGE
svn export -r 36116 https://source.sakaiproject.org/svn/site-manage/trunk site-manage-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/site-manage vendor/current-trunk site-manage-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/tags/trunk-R36116 -m 'tagging site-manage vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/trunk site-manage-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/tags/trunk-R36116 site-manage-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' site-manage-trunk-workingcopy
- Resolved Conflicts
Wasn't able to merge!!!
TEST-HARNESS
svn export -r 36116 https://source.sakaiproject.org/svn/test-harness/trunk test-harness-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/test-harness vendor/current-trunk test-harness-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R36116 -m 'tagging test-harness vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/trunk test-harness-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/test-harness/tags/trunk-R36116 test-harness-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' test-harness-trunk-workingcopy
- Resolved Conflicts
- none
TOOL
svn export -r 36116 https://source.sakaiproject.org/svn/tool/trunk tool-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/tool vendor/current-trunk tool-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/tool/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R36116 -m 'tagging tool vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/tool/trunk tool-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/tool/tags/trunk-R36116 tool-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' tool-trunk-workingcopy
- Resolved Conflicts
- tool-trunk-workingcopy/tool-tool/.classpath
- tool-trunk-workingcopy/tool-util/.classpath
USER
svn export -r 36116 https://source.sakaiproject.org/svn/user/trunk user-trunk /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/user vendor/current-trunk user-trunk svn copy https://mware.ucdavis.edu/svn/ucd-sakai/user/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R36116 -m 'tagging user vendor drop trunk-R36116' svn co https://mware.ucdavis.edu/svn/ucd-sakai/user/trunk user-trunk-workingcopy svn merge https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/user/tags/trunk-R36116 user-trunk-workingcopy svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' user-trunk-workingcopy
- Resolved Conflicts
- * Resolved Conflicts
- user-trunk-workingcopy/user-impl/.classpath
- user-trunk-workingcopy/user-impl/impl/src/java/org/sakaiproject/user/impl/DbUserService.java