[Crossfire-wiki] [Crossfire DokuWiki] page changed: downloading

[no-reply_wiki at metalforge.org]

A page in your DokuWiki was added or changed. Here are the details:

Date        : 2009/01/19 00:41
User        : lalomartins
Edit Summary: updating trunk/branch usage instructions

@@ -18,17 +18,17 @@
  ==== Trunk & Branch: ====
  
  You will also notice that there are directories labeled as trunk and branch.
  
- The trunk is the latest development changes going only into 2.0 when it is released.
+ The trunk is the latest development changes which may or may not go into the next 1.x release.
  
- The 1.x branch is for continued 1.x development, including only small bugfixes and minor features. 
+ The 1.x branches fall in two categories; for those that were already released (1.11 as of this writing), the branch is for critical bugfixes to that release.  For future releases (1.12 and 1.13 as of this writing), this is where changes from trunk are merged as they're tested enough, in preparation for the future release.
  
- Unless doing development it is recommended to use the 1.x branch until 2.0 is released. 
    * Development , recent updates and latest features == trunk
-   *  Tested & stable features, bug fixes, etc. == branch
+   * Tested & stable features, bug fixes, etc. == next release branch
+   * Critical bugfixes on released version == previous release branch(es)
  
- Notice: It is highly recommend that you use a trunk mapset with a trunk server and a branch mapset with a branch server as incompatible changes may occur. Meaning a map in trunk may only work with the trunk server and vice versa.
+ Notice: It is highly recommend that you use a trunk mapset with a trunk server and a branch mapset with a branch server as incompatible changes may occur. Meaning a map in trunk may only work with the trunk server and vice versa.  (Same goes for different 1.x releases.)
  
  
  === Trunk & Branch Commands: ===
  
@@ -36,12 +36,12 @@
  
  Note: The commands, below, presume you are in the directory where the archetypes, client, maps or server currently reside.
  
    * Branch: 
-     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/arch/branches/1.x
-     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/client/branches/1.x
-     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.x 
-     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/branches/1.x
+     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/arch/branches/1.12
+     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/client/branches/1.12
+     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.12
+     * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/branches/1.12
    * Trunk: 
      * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/arch/trunk
      * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/client/trunk
      * svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/trunk
@@ -49,13 +49,13 @@
  
  It is also possible to checkout files from SVN and have them install to a remote directory. This is accomplished by adding the file path to the end of the SVN command.
  
  For instance:
- svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.x /path/to/map/directory/
+ svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.12 /path/to/map/directory/
  
  Or, more specifically:
- svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.x /share/crossfire/maps/
+ svn co https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/branches/1.12 /share/crossfire/maps/
  
  This would check out the latest changes to maps 1.x branch and place them in the /share/crossfire/maps/ directory.
  
  ==== Browse the SVN Repository ====
  Latest SVN changes and history is available at: http://crossfire.svn.sourceforge.net/viewvc/crossfire/


IP-Address  : 209.162.35.64
Old Revision: http://wiki.metalforge.net/doku.php/downloading?rev=1184864289
New Revision: http://wiki.metalforge.net/doku.php/downloading

-- 
This mail was generated by DokuWiki at
http://wiki.metalforge.net/