[Bast-commits] r9738 - ironman/IronMan-Web/branches/dev

[idn at dev.catalyst.perl.org]

Author: idn
Date: 2010-09-23 02:26:42 +0100 (Thu, 23 Sep 2010)
New Revision: 9738

Added:
   ironman/IronMan-Web/branches/dev/development-cycle.pod
Log:
I thought I added this ages ago

Added: ironman/IronMan-Web/branches/dev/development-cycle.pod
===================================================================
--- ironman/IronMan-Web/branches/dev/development-cycle.pod	                        (rev 0)
+++ ironman/IronMan-Web/branches/dev/development-cycle.pod	2010-09-23 01:26:42 UTC (rev 9738)
@@ -0,0 +1,49 @@
+=head1 IronMan::Web
+
+This module forms part of the Enlightened Perl Organisation IronMan project.
+
+For more details, see the overview document at:
+
+    http://dev.catalyst.perl.org/repos/bast/ironman/overview.pod
+ 
+The latest version of this document can be found at:
+
+    http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/dev/development-cycle.pod
+
+=head2 Development branch preparation.
+
+The development branch has the following known intentional differences:
+
+=head3 The '-Debug' option
+
+    diff -Naur branches/ironboy/lib/IronMan/Web.pm branches/dev/lib/IronMan/Web.pm
+    --- branches/ironboy/lib/IronMan/Web.pm 2010-07-10 10:37:30.825413356 +0100
+    +++ branches/dev/lib/IronMan/Web.pm     2010-07-10 10:37:31.174421647 +0100
+    @@ -14,7 +14,7 @@
+     # Static::Simple: will serve static files from the application's root 
+     #                 directory
+     
+    -use Catalyst qw/ConfigLoader Static::Simple StackTrace/;
+    +use Catalyst qw/-Debug ConfigLoader Static::Simple StackTrace/;
+     
+     our $VERSION = '0.01';
+
+=head2 Comparing branches
+
+Use the following to compare the two branches:
+
+    diff -Naur branches/ironboy/ branches/dev/ --exclude .svn | more
+
+Carefully review the changes presented to ensure there is nothing unexpected.
+
+=head2 Development to IronBoy
+
+Merge the changes from dev to ironboy, I suggest doing this per file (eg :
+
+
+
+    svn merge 
+
+    
+
+=cut