Difference between revisions of "UnHackCvsSync"

From Apache OpenOffice Wiki
Jump to: navigation, search
(No difference)

Revision as of 15:58, 11 October 2006

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. cd ~/data_trunk (SVN /data_trunk)
  6. svnmerge merge
  7. full build, resolve conflicts, repeat until no conflicts
  8. svn ci ~/trunk ~/data_trunk -m "Merged upstreams milestone <milestone>"
Retrieved from "https://wiki.openoffice.org/w/index.php?title=UnHackCvsSync&oldid=18398"
Personal tools