Difference between revisions of "UnHackCvsSync"

Revision as of 17:02, 11 October 2006

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>"

NB: Look into how to generate localize.sdf files in some sane manner

Revision as of 17:02, 11 October 2006 (view source) KaiB (Talk \| contribs) ← Older edit		Revision as of 17:02, 11 October 2006 (view source) KaiB (Talk \| contribs) (→‎Updating the vendor branch) Newer edit →
Line 8:		Line 8:
	# svn ci ~/trunk -m "Merged upstreams milestone <milestone>"		# svn ci ~/trunk -m "Merged upstreams milestone <milestone>"

−	'''NB: Look into how to ~~import~~ localize.sdf files in some sane manner'''	+	'''NB: Look into how to generate localize.sdf files in some sane manner'''