...
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
- user-trunk-workingcopy/user-impl/.classpath
- user-trunk-workingcopy/user-impl/impl/src/java/org/sakaiproject/user/impl/DbUserService.java