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