[svn:parrot] r41135 - trunk/docs/project

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Mon Sep  7 20:38:47 2009
New Revision: 41135
URL: https://trac.parrot.org/parrot/changeset/41135

Log:
Qualify advice about synchronizing branch with more recent changes in trunk.

Modified:
   trunk/docs/project/branching_guide.pod

Modified: trunk/docs/project/branching_guide.pod
==============================================================================
--- trunk/docs/project/branching_guide.pod	Mon Sep  7 20:25:30 2009	(r41134)
+++ trunk/docs/project/branching_guide.pod	Mon Sep  7 20:38:47 2009	(r41135)
@@ -35,11 +35,13 @@
 
 =head3 SVN
 
-On a regular basis (at least weekly, more often for heavy changes), synchronize
-your branch with the changes in trunk. For this you will need the revision
-number of your most recent synchronization (or the revision number of the
-initial branch creation if this is the first synchronization), and the current
-highest revision in trunk (you can get this by running C<svn update>).
+If your branch touches many source code files or is expected to be long-lived,
+you may wish to consider synchronizing your branch with changes in trunk on a
+regular basis (at least weekly, more often for heavy changes). For this you
+will need the revision number of your most recent synchronization (or the
+revision number of the initial branch creation if this is the first
+synchronization), and the current highest revision in trunk (you can get this
+by running C<svn update>).
 
 Make sure you don't have any outstanding changes in your working copy (use
 C<svn status>).