[prev in list] [next in list] [prev in thread] [next in thread]
List: apache-modperl-cvs
Subject: svn commit: r584365 - in /perl/modperl/trunk: BRANCHING build/svn.remerge
From: gozer () apache ! org
Date: 2007-10-13 4:13:01
Message-ID: 20071013041301.4329D1A9832 () eris ! apache ! org
[Download RAW message or body]
Author: gozer
Date: Fri Oct 12 21:13:00 2007
New Revision: 584365
URL: http://svn.apache.org/viewvc?rev=584365&view=rev
Log:
Update SVN merging instructions to svnmerge best
usage.
Removed:
perl/modperl/trunk/build/svn.remerge
Modified:
perl/modperl/trunk/BRANCHING
Modified: perl/modperl/trunk/BRANCHING
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/BRANCHING?rev=584365&r1=584364&r2=584365&view=diff
==============================================================================
--- perl/modperl/trunk/BRANCHING (original)
+++ perl/modperl/trunk/BRANCHING Fri Oct 12 21:13:00 2007
@@ -1,53 +1,81 @@
This doc explains how to create/work/re-merge svn branches
#######################################
-### make a new branch ###
+### PREREQUISITE ###
#######################################
-we will create a branch clone-skip-unstable
+You need to have svnmerge installed and working
+before you can proceed with rest of the instructions.
-tag before the branch:
+You can find it here:
- 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"
+http://www.orcaware.com/svn/wiki/Svnmerge.py
+
+#######################################
+### make a new branch ###
+#######################################
+
+we will create a branch mybranch
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"
+ https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch \
+ -m "creating mybranch"
check out:
- svn co https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
mp2-clone-skip-unstable + svn co \
https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch
change externals to point to the new A-T branch (if one was done)
svn propedit svn:externals .
-#######################################
-### sync the branch with the trunk ###
-#######################################
+initialize svnmerge tracking in the branch (if you plan to pull trunk/ changes into \
the branch)
-the branch was created @r165203
+mybranch/ $> svnmerge init
+property 'svnmerge-integrated' set on '.'
+mybranch/ $> svn ci -F svnmerge-commit-message.txt
- 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
+initialize svnmerge tracking on the trunk:
-from now on, all you need to do is to run:
+trunk/ $> svnmerge init \
https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch +property \
'svnmerge-integrated' set on '.' +mybranch/ $> svn ci -F svnmerge-commit-message.txt
- build/svn.remerge
-as it automatically sets the merge-point during the last run
+##############################################
+### merging changes from branch to brahch ###
+##############################################
+Work from a clean checkout of the branch you want to merge *to*
-#######################################
-### merge the branch into the trunk ###
-#######################################
+Check on the availability of changes to merge
+
+$> svnmerge avail -b -l
+
+------------------------------------------------------------------------
+r584362 | gozer | 2007-10-12 21:00:47 -0700 (Fri, 12 Oct 2007) | 1 line
+Changed paths:
+ A /perl/modperl/branches/mybranch (from /perl/modperl/trunk:584361)
+
+creating mybranch
+------------------------------------------------------------------------
+r584363 | gozer | 2007-10-12 21:05:32 -0700 (Fri, 12 Oct 2007) | 3 lines
+Changed paths:
+ M /perl/modperl/branches/mybranch
+
+Initialized merge tracking via "svnmerge" with revisions "1-584361" from
+https://svn.apache.org/repos/asf/perl/modperl/trunk
+
+Then merge the ones you want to merge
+
+$> svnmerge -r 584362-584363
+
+review the changes, fix conflicts, etc
+
+Check in the merged version
+
+$> svn ci -F svnmerge-commit-message.txt
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic