Author: stas
Date: Tue May 17 13:43:07 2005
New Revision: 170659
URL: http://svn.apache.org/viewcvs?rev=170659&view=rev
Log:
- start documenting the work with branches
- add Joe Orton's svn.remerge script, used in that doc
Added:
perl/modperl/trunk/BRANCHING
perl/modperl/trunk/build/svn.remerge (with props)
Added: perl/modperl/trunk/BRANCHING
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/BRANCHING?rev=170659&view=auto
==============================================================================
--- perl/modperl/trunk/BRANCHING (added)
+++ perl/modperl/trunk/BRANCHING Tue May 17 13:43:07 2005
@@ -0,0 +1,47 @@
+This doc explains how to create/work/re-merge svn branches
+
+#######################################
+### make a new branch ###
+#######################################
+
+we will create a branch clone-skip-unstable
+
+tag before the branch:
+
+ svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
+ https://svn.apache.org/repos/asf/perl/modperl/tags/pre-clone-skip \
+ -m "tag before branching for CLONE_SKIP support"
+
+branch:
+
+ svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
+ https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable
\
+ -m "branching to provide CLONE_SKIP support"
+
+check out:
+
+ svn co
https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable
mp2-clone-skip-unstable
+
+change externals to point to the new A-T branch (if one was done)
+
+ svn propedit svn:externals .
+
+#######################################
+### sync the branch with the trunk ###
+#######################################
+
+the branch was created @r165203
+
+ svn co
https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
+ mp2-clone-skip-unstable
+ cd mp2-clone-skip-unstable
+ svn propset merge-point 165203 .
+ build/svn.remerge
+
+now resolve any conflicts and commit the changes
+
+
+#######################################
+### merge the branch into the trunk ###
+#######################################
+
Added: perl/modperl/trunk/build/svn.remerge
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/build/svn.remerge?rev=170659&view=auto
==============================================================================
--- perl/modperl/trunk/build/svn.remerge (added)
+++ perl/modperl/trunk/build/svn.remerge Tue May 17 13:43:07 2005
@@ -0,0 +1,24 @@
+#!/bin/bash
+# automatic SVN merging
+
+root=`svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL: //;p}'`
+trunk=${root}/trunk
+
+# svn 1.2.x supports "svn info URL". Without that, a stupid
+# ls command is needed to find the current revision of the trunk
+#next=`svn info $trunk | sed -n '/^Revision: /{s/.*: //g;p}'`
+
+next=`svn ls --verbose $root | sed -n '/ trunk/{s/^ *//g;s/ .*//g;p}'`
+last=`svn propget merge-point .`
+
+echo "$0: merging from trunk from r$last to r$next"
+
+echo + svn merge -r$last:$next $trunk .
+svn merge -r$last:$next $trunk .
+echo + svn propset merge-point $next
+svn propset merge-point $next .
+last=$((last + 1))
+echo Merge r$last to r$next from trunk: > clog
+echo >> clog
+echo + svn log -r$last:$next $trunk
+svn log -r$last:$next $trunk | sed '/^------/,/^$/d' >> clog
Propchange: perl/modperl/trunk/build/svn.remerge
------------------------------------------------------------------------------
svn:executable = *
