Difference between revisions of "UnHackCvsSync"
From Apache OpenOffice Wiki
(→Updating the vendor branch) |
|||
| Line 4: | Line 4: | ||
# ./import-ooo-cvs <milestone> <svn_username> <svn_password>, (example: ./import-ooo-cvs m187 kai.backman secret) | # ./import-ooo-cvs <milestone> <svn_username> <svn_password>, (example: ./import-ooo-cvs m187 kai.backman secret) | ||
# cd ~/trunk (SVN /trunk) | # cd ~/trunk (SVN /trunk) | ||
| − | |||
| − | |||
# svnmerge merge | # svnmerge merge | ||
# full build, resolve conflicts, repeat until no conflicts | # full build, resolve conflicts, repeat until no conflicts | ||
| − | # svn ci ~/trunk | + | # svn ci ~/trunk -m "Merged upstreams milestone <milestone>" |
Revision as of 17:01, 11 October 2006
Updating the vendor branch
- Check out the unhack tools: /contrib/unhack
- ./import-ooo-cvs <milestone> <svn_username> <svn_password>, (example: ./import-ooo-cvs m187 kai.backman secret)
- cd ~/trunk (SVN /trunk)
- svnmerge merge
- full build, resolve conflicts, repeat until no conflicts
- svn ci ~/trunk -m "Merged upstreams milestone <milestone>"
