Changes between Version 8 and Version 9 of ReleaseProcedure

Timestamp:

Oct 8, 2007, 3:40:55 AM (14 years ago)

Author:

Peter

Comment:

--

ReleaseProcedure

@@ -131 +131 @@
     [http://trac.thep.lu.se/trac/yat/admin/ticket/versions trac-admin tool].
     Remember to set the date.[[br]][[br]]
+ 1. Merge the minor release into the trunk. To avoid confusion and
+    minimize the risk of loosing fixes, this step is only performed by
+    the ''Merge Master''. [[br]][[br]]
+  i. Checkout a pristine version of the trunk.
+{{{
+svn checkout http://lev.thep.lu.se/repository/yat/trunk trunk_merge
+}}}
+  i. Merge changes into trunk. In this example the diffence between a
+     minor release tag and the first patch release tag is merged into
+     the trunk WC
+{{{
+cd trunk_merge
+svn merge http://lev.thep.lu.se/repository/yat/tags/A.B \
+          http://lev.thep.lu.se/repository/yat/tags/A.B.1
+}}}
+  i. Resolve all conflicts. Run tests and perform all other
+     appropriate tests to make sure that the merge does not create
+     havoc. [[br]][[br]]
+  i. Commit changes to the trunk branch.
+{{{
+svn commit -m "Merged patch release A.B.1 to the trunk. Delta A.B.1 - A.B"
+}}}
  1. Create a distribution package:
 {{{
@@ -270 +292 @@
   i. In section '''yat ''stable'' ''' update link to
      `[milestone:A.B.[C+1] A.B.[C+1]]`.[[br]][[br]]
-  i. On WikiStart update reference to explicit latest version number, and links `[source:tags/A.B/doc/readme.txt Manual]` (in two places), `[source:tags/A.B/NEWS NEWS]`, and `[source:tags/A.B/INSTALL Install]`.[[br]][[br]] 
+  i. On WikiStart update reference to explicit latest version number, and `[source:tags/A.B/NEWS NEWS]`.[[br]][[br]] 
+  i. Generate documentation to new version of yat, and update link on WikiStart.[[br]][[br]]
  1. Prepare the minor branch for the next patch release [[br]][[br]]
   i. Update version number in `configure.ac`. Locate and change the
@@ -292 +315 @@
  1. Merge the patch release into the trunk. To avoid confusion and
     minimize the risk of loosing fixes, this step is only performed by
-    the Merge Master. [[br]][[br]]
+    the ''Merge Master''. [[br]][[br]]
   i. Checkout a pristine version of the trunk.
 {{{