| Version 8 (modified by , 16 years ago) ( diff ) |
|---|
Return to the Main Page
- Development Notes -- needs to be updated
- Creating an IPP Release
- Dot Emacs File
- Notes on setting up a mirroring process for getting dvo data to institutions
- Debugging: Some help on debugging problems
- Code Profiling: How to profile the code
- Adding a new Detrend Type
- Error Handling by functions which call psVectorStats
- Details on running nightly science.
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.
Note:
See TracWiki
for help on using the wiki.
