UnHackCvsSync

From Apache OpenOffice Wiki
Jump to: navigation, search

Updating the vendor branch

  1. Check out the unhack tools: /contrib/unhack
  2. ./import-ooo-cvs <milestone> <svn_username> <svn_password>, (example: ./import-ooo-cvs m187 kai.backman secret)
  3. cd ~/trunk (SVN /trunk)
  4. svnmerge merge
  5. full build, resolve conflicts, repeat until no conflicts
  6. svn ci ~/trunk -m "Merged upstreams milestone <milestone>"
Personal tools