[27875] trunk/base/portmgr/ReleaseProcess

[source_changes at macosforge.org]

Revision: 27875
          http://trac.macosforge.org/projects/macports/changeset/27875
Author:   jmpp at macports.org
Date:     2007-08-15 10:12:54 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------

Provide updated release protocol instructions:

 * autoconf now reads MacPorts' version from the base/config/mp_version file, so instruct to rebuild the configure script if that's changed;
 * Recommend to use the svnmerge.py tool to maintain merging information between a release branch and trunk/base.

Modified Paths:
--------------
    trunk/base/portmgr/ReleaseProcess

Modified: trunk/base/portmgr/ReleaseProcess
===================================================================
--- trunk/base/portmgr/ReleaseProcess	2007-08-15 16:14:52 UTC (rev 27874)
+++ trunk/base/portmgr/ReleaseProcess	2007-08-15 17:12:54 UTC (rev 27875)
@@ -49,7 +49,11 @@
 
 Only the base subdirectory, not the ports subdirectory, is branched for a given release.
 
+It is strongly recommended to use the svnmerge.py tool provided by the subversion project to
+maintain release branches if you pretend to merge revisions back and forth between them and
+trunk/base, which is a very likely scenario.
 
+
 === Prepare the code for Release ===
 
 In preparation for a release, several things should be completed within the code:
@@ -57,11 +61,13 @@
  * Update the file base/ChangeLog in both trunk and the relase branch to reflect the appropriate changes.
  * Update the file base/config/mp_version with the target release number. Note that this is a floating
    point number that corresponds to the release number; it should correspond roughly to the release number
-   where possible. Release 1.4.1, for instance, would be represented by the floating point number 1.41.
+   where possible. Release 1.4.1, for instance, would be represented by the floating point number 1.410.
    The version number in mp_version is displayed by the port command as the version of MacPorts,
    and is used by the selfupdate command to determine whether a newer version of code is available.
    This number should be different between trunk and a release branch, the former greater to differentiate
    it from the latter.
+ * Update the autoconf 'configure' script through the provided base/regen.sh script once the version number
+   in mp_version has been changed, since the former reads the latter.
  * Make sure that these, and any other changes or bug fixes are made on and/or merged between the release branch
    and trunk as needded. For instance, if you've made changes to ChangeLog only on the release branch,
    those changes should be merged back into trunk as well.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070815/ea826ede/attachment.html