...
- Resolved Conflicts
- portal-trunk-workingcopy/portal-impl/.classpath
- portal-trunk-workingcopy/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java
PROVIDERS
| No Format |
|---|
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
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
...