...
| 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
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
...