[cig-commits] r17081 - short/3D/PyLith/trunk/doc/developer

[brad at geodynamics.org]

Author: brad
Date: 2010-08-12 09:02:05 -0700 (Thu, 12 Aug 2010)
New Revision: 17081

Added:
   short/3D/PyLith/trunk/doc/developer/howto_mergefromstable.txt
Log:
Added notes on how to merge from stable branch.

Added: short/3D/PyLith/trunk/doc/developer/howto_mergefromstable.txt
===================================================================
--- short/3D/PyLith/trunk/doc/developer/howto_mergefromstable.txt	                        (rev 0)
+++ short/3D/PyLith/trunk/doc/developer/howto_mergefromstable.txt	2010-08-12 16:02:05 UTC (rev 17081)
@@ -0,0 +1,5 @@
+# Run svn log to find last marge.
+svn log | less
+
+# Merge from stable branch.
+svn merge -r REV_FROM_LAST_MERGE:HEAD svn+ssh://svn@geodynamics.org/cig/short/3D/PyLith/branches/v1.5-stable .