Return to the Main Page

Merging branches into trunk:

  • goto branch: svn merge $svn/trunk
  • goto local trunk copy: svn merge --reintegrate $svn/branches/mybranch
  • if you have the following message:
    Error: Some revisions have been merged under it that have not been merged
    Error: into the reintegration target; merge them first, then retry. 
    
    you may need to clear out the mergeinfo properties
  • goto branch:
      svn -R propdel svn:mergeinfo .
      svn ci -m 'deleted all mergeinfo from branch' .
    
    then return to trunk copy and do the reintegration again. See this thread for a discussion.