Difference between revisions of "UnHackCvsSync"
From Apache OpenOffice Wiki
(→Updating the vendor branch) |
|||
Line 9: | Line 9: | ||
'''NB: Look into how to generate localize.sdf files in some sane manner''' | '''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' === | ||
+ | |||
+ | see http://www.reactos.org/wiki/index.php/Subversion#SVN_merge_says:_Revision_X_doesn.27t_match_existing_revision_X_in_.27Y.27 for an explanation. | ||
+ | |||
+ | 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. |
Revision as of 15:46, 25 October 2006
Contents
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>"
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'
see http://www.reactos.org/wiki/index.php/Subversion#SVN_merge_says:_Revision_X_doesn.27t_match_existing_revision_X_in_.27Y.27 for an explanation.
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.