Return to the [wiki:WikiStart Main Page]

 * [wiki:Development_Notes Development Notes] -- needs to be updated
 * [wiki:Creating_an_IPP_Release Creating an IPP Release]
 * [wiki:Dot_Emacs_File Dot Emacs File]
 * [wiki:Mirroring Notes on setting up a mirroring process for getting dvo data to institutions]
 * [wiki:Debugging Debugging]: Some help on debugging problems
 * [wiki:Code_Profiling Code Profiling]: How to profile the code
 * [wiki:AddingNewDetrendType Adding a new Detrend Type]
 * [wiki:psVectorStats_ErrorHandling Error Handling by functions which call psVectorStats]

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 'deleted mergeinfo from everywhere on branch' .}}}
  then return to trunk copy and do the reintegration again.