Page Comparison

...

svn export -r 36116 https://source.sakaiproject.org/svn/dav/trunk dav-trunk
/usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/dav vendor/current-trunk dav-trunk
svn copy https://mware.ucdavis.edu/svn/ucd-sakai/dav/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R36116 -m 'tagging dav vendor drop trunk-R36116'
svn co https://mware.ucdavis.edu/svn/ucd-sakai/dav/trunk dav-trunk-workingcopy
svn merge https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/dav/tags/trunk-R36116 dav-trunk-workingcopy
svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' dav-trunk-workingcopy

• Resolved Conflicts
  **

  ...

  • • dav-trunk-workingcopy/.classpath

  GRADEBOOK

  No Format
  svn export -r 36116 https://source.sakaiproject.org/svn/gradebook/trunk gradebook-trunk

  ...

  /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/gradebook vendor/current-trunk gradebook-trunk

  ...

  svn copy https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R36116 -m 'tagging gradebook vendor drop trunk-R36116'

  ...

  svn co https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/trunk gradebook-trunk-workingcopy

  ...

  svn merge https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R32756 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/tags/trunk-R36116 gradebook-trunk-workingcopy

  ...

  svn commit -m 'Applied vendor branch modification R32756:R36116 (trunk)' gradebook-trunk-workingcopy

  • Resolved Conflicts
    • svn export -r 36116 https://source.sakaiproject.org/svn/help/trunk help-trunk
      /usr/share/doc/subversion-1.4.4/svn_load_dirs.pl https://mware.ucdavis.edu/svn/ucd-sakai/help vendor/current-trunk help-trunk
      svn copy https://mware.ucdavis.edu/svn/ucd-sakai/help/vendor/current-trunk https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 -m 'tagging help vendor drop trunk-R36116'
      svn co https://mware.ucdavis.edu/svn/ucd-sakai/help/trunk help-trunk-workingcopy
      svn merge https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R30780 https://mware.ucdavis.edu/svn/ucd-sakai/help/tags/trunk-R36116 help-trunk-workingcopy
      svn commit -m 'Applied vendor branch modification R30780:R36116 (trunk)' help-trunk-workingcopy

  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

  ...