[27877] branches/release_1_5/base

[source_changes at macosforge.org]

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

Log Message:
-----------
Merged revisions 26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26736,26738-26743,26745-26752,26754-26764,26766-26803,26805,26807-26808,26810,26815-26828,26830-26841,26843-26849,26852-26862,26867-26869,26871-26902,26904-26920,26922-26936,26938-26939,26941,26943-26975,26977-27017,27019-27020,27023,27027-27042,27045-27052,27054-27064,27066-27078,27081-27109,27111-27121,27123-27126,27128-27139,27141-27198,27200,27203-27294,27298-27312,27314-27378,27380-27404,27406-27414,27416-27509,27511-27517,27529-27616,27619,27623-27641,27643,27645-27646,27648-27708,27712-27718,27721-27772,27774-27778,27780-27822,27827-27849,27851-27876 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27875 | jmpp at macports.org | 2007-08-15 13:12:54 -0400 (Wed, 15 Aug 2007) | 7 lines
  
  
  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.
........
  r27876 | jmpp at macports.org | 2007-08-15 13:17:22 -0400 (Wed, 15 Aug 2007) | 1 line
  
  Rephrase a bit the comment on svnmerge.py
........

Modified Paths:
--------------
    branches/release_1_5/base/portmgr/ReleaseProcess

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27850
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27876

Modified: branches/release_1_5/base/portmgr/ReleaseProcess
===================================================================
--- branches/release_1_5/base/portmgr/ReleaseProcess	2007-08-15 17:17:22 UTC (rev 27876)
+++ branches/release_1_5/base/portmgr/ReleaseProcess	2007-08-15 17:29:46 UTC (rev 27877)
@@ -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 port) to
+maintain merge tracking information between release branches and trunk/base if you pretend to
+merge revisions back and forth between them, 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/865102fa/attachment.html