...
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
| 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
- providers-trunk-workingcopy/.classpath
REFERENCE
| No Format |
|---|
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
| No Format |
|---|
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
| No Format |
|---|
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
| 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