Changes between Version 3 and Version 4 of Software_Development

Timestamp:

Oct 2, 2009, 1:29:13 PM (17 years ago)

Author:

eugene

Comment:

--

Software_Development

@@ -9 +9 @@
  * [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.
+
+