[Bast-commits] r9921 - in ironman/IronMan-Web: . trunk
idn at dev.catalyst.perl.org
idn at dev.catalyst.perl.org
Wed Jul 4 11:47:03 GMT 2012
Author: idn
Date: 2012-07-04 11:47:03 +0000 (Wed, 04 Jul 2012)
New Revision: 9921
Added:
ironman/IronMan-Web/development-cycle.pod
Removed:
ironman/IronMan-Web/trunk/development-cycle.pod
Log:
Moving docs up a level
Copied: ironman/IronMan-Web/development-cycle.pod (from rev 9920, ironman/IronMan-Web/trunk/development-cycle.pod)
===================================================================
--- ironman/IronMan-Web/development-cycle.pod (rev 0)
+++ ironman/IronMan-Web/development-cycle.pod 2012-07-04 11:47:03 UTC (rev 9921)
@@ -0,0 +1,112 @@
+=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/trunk/development-cycle.pod
+
+The repository is layed out as follows:
+
+ branches - current development branches
+ tags - current releases including live and dev sites
+ trunk - current cutting edge waiting for release tagging
+
+=head1 Trunk and branches.
+
+Trunk contains the latest cutting edge code. It's recommended that you don't
+work directly in trunk, but create yourself a branch.
+
+=head2 Branches.
+
+Create your own branch for 'very cool new feature' as follows:
+
+ svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk/ \
+ http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/very_cool_new_feature \
+ -m "Creating branch to work on my very cool new feature"
+
+Work on files in your branch, then once you're done you can either poke someone
+on the irc channel or you can merge it back into trunk yourself (see below).
+
+=head2 The '-Debug' option
+
+You may wish to enable the Catalyst debugging module within your branch.
+
+ 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';
+
+
+=head1 Merging bug fixes and branches back into trunk.
+
+In order to maintain a nice history and clean revisions for rollback and
+additions, we'll create ourselves a new tagged version and then copy that
+to ironboy for testing. Once testing is completed, we'll delete the
+ironboy tag and copy ironman to it.
+
+=head2 Merging into trunk
+
+Merging a branch back into trunk:
+
+ svn co http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk/
+ cd trunk
+ svn merge --reintegrate http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/very_cool_new_feature
+ svn commit -m "Merging very cool new feature branch back into trunk"
+
+=head2 Comparing branches for cherry picking
+
+
+Need to add docs here...
+
+
+=head1 Release process
+
+=head2 Trunk to release
+
+Increment the version number within lib/IronMan/Web.pm:
+
+ our $VERSION = '0.02';
+
+Commit the change:
+
+ svn commit lib/IronMan/Web.pm -m "Incrementing version"
+
+Copy trunk to the release:
+
+ svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk \
+ http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/IronMan-Web-0.03 \
+ -m "Copying trunk to IronMan-Web release tag"
+
+=head2 Release to ironboy
+
+Delete the currently tagges ironman
+
+ svn del http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy \
+ -m "Removing ironboy for release of IronMan-Web-0.02"
+ svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/IronMan-Web-0.03 \
+ http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy \
+ -m "Releasing IronMan-Web-0.02 to ironboy"
+
+=head2 Ironboy to ironman
+
+Delete the currently tagges ironman
+
+ svn del http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironman \
+ -m "Removing ironman for release of ironboy"
+ svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy
+ http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironman \
+ -m "Releasing ironboy to ironman"
+
+=cut
Deleted: ironman/IronMan-Web/trunk/development-cycle.pod
===================================================================
--- ironman/IronMan-Web/trunk/development-cycle.pod 2012-06-30 18:16:04 UTC (rev 9920)
+++ ironman/IronMan-Web/trunk/development-cycle.pod 2012-07-04 11:47:03 UTC (rev 9921)
@@ -1,112 +0,0 @@
-=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/trunk/development-cycle.pod
-
-The repository is layed out as follows:
-
- branches - current development branches
- tags - current releases including live and dev sites
- trunk - current cutting edge waiting for release tagging
-
-=head1 Trunk and branches.
-
-Trunk contains the latest cutting edge code. It's recommended that you don't
-work directly in trunk, but create yourself a branch.
-
-=head2 Branches.
-
-Create your own branch for 'very cool new feature' as follows:
-
- svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk/ \
- http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/very_cool_new_feature \
- -m "Creating branch to work on my very cool new feature"
-
-Work on files in your branch, then once you're done you can either poke someone
-on the irc channel or you can merge it back into trunk yourself (see below).
-
-=head2 The '-Debug' option
-
-You may wish to enable the Catalyst debugging module within your branch.
-
- 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';
-
-
-=head1 Merging bug fixes and branches back into trunk.
-
-In order to maintain a nice history and clean revisions for rollback and
-additions, we'll create ourselves a new tagged version and then copy that
-to ironboy for testing. Once testing is completed, we'll delete the
-ironboy tag and copy ironman to it.
-
-=head2 Merging into trunk
-
-Merging a branch back into trunk:
-
- svn co http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk/
- cd trunk
- svn merge --reintegrate http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/very_cool_new_feature
- svn commit -m "Merging very cool new feature branch back into trunk"
-
-=head2 Comparing branches for cherry picking
-
-
-Need to add docs here...
-
-
-=head1 Release process
-
-=head2 Trunk to release
-
-Increment the version number within lib/IronMan/Web.pm:
-
- our $VERSION = '0.02';
-
-Commit the change:
-
- svn commit lib/IronMan/Web.pm -m "Incrementing version"
-
-Copy trunk to the release:
-
- svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/trunk \
- http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/IronMan-Web-0.03 \
- -m "Copying trunk to IronMan-Web release tag"
-
-=head2 Release to ironboy
-
-Delete the currently tagges ironman
-
- svn del http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy \
- -m "Removing ironboy for release of IronMan-Web-0.02"
- svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/IronMan-Web-0.03 \
- http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy \
- -m "Releasing IronMan-Web-0.02 to ironboy"
-
-=head2 Ironboy to ironman
-
-Delete the currently tagges ironman
-
- svn del http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironman \
- -m "Removing ironman for release of ironboy"
- svn cp http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironboy
- http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/tags/ironman \
- -m "Releasing ironboy to ironman"
-
-=cut
More information about the Bast-commits
mailing list