Author: stas
Date: Wed Sep 7 16:32:45 2005
New Revision: 279459
URL: http://svn.apache.org/viewcvs?rev=279459&view=rev
Log:
some updates
Modified:
perl/modperl/trunk/BRANCHING
Modified: perl/modperl/trunk/BRANCHING
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/BRANCHING?rev=279459&r1=279458&r2=279459&view=diff
==============================================================================
--- perl/modperl/trunk/BRANCHING (original)
+++ perl/modperl/trunk/BRANCHING Wed Sep 7 16:32:45 2005
@@ -40,6 +40,12 @@
now resolve any conflicts and commit the changes
+from now on, all you need to do is to run:
+
+ build/svn.remerge
+
+as it automatically sets the merge-point during the last run
+
#######################################
### merge the branch into the trunk ###
