Updating the vendor branch
- Check out the unhack tools: /contrib/unhack
- ./import-ooo-cvs <milestone> (example: ./import-ooo-cvs m187; note that the result is undefined if you have never committed to this svn repository)
- cd ~/trunk (SVN /trunk)
- svnmerge merge
- full build, resolve conflicts, repeat until no conflicts
- svn ci ~/trunk --file svnmerge-* (FIXME what's the exact file name?)
NB: Look into how to generate localize.sdf files in some sane manner
SVN error messages top ten
I'm sure there will be ten entries in this list soon...
x has copy flag but no copyfrom URL
No clue what exactly causes this message.
SVN merge says: Revision X doesn't match existing revision X in 'Y'
This happens when you try to merge too many milestones at once and a file was deleted in one milestone and resurrected in a later milestone.