AUTHZ
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
...