Changes between Version 1 and Version 2 of Develop/SourceControl

Timestamp:

Oct 8, 2016, 1:14:33 PM (8 years ago)

Author:

pulkomandy

Comment:

--

Develop/SourceControl

@@ -31 +31 @@
 This creates a working copy in (new) directory _stable_.
 
-==== Reporting fixes from release into trunk ===
+==== Reporting fixes from release into trunk ====
 After they're coded and packaged, the fixes can be reported back to trunk (so the next unstable version also benefits from the fixes). To do so:
-  # change directory to a working copy of trunk, and type: 
+ 1. change directory to a working copy of trunk, and type: 
 {{{
 svn merge svn://pulkomandy.tk/GrafX2/branches/release/
 }}}
-  # Solve any conflicts (sometimes the fixes are already applied but differently)
-  # Check in.
+ 1. Solve any conflicts (sometimes the fixes are already applied but differently)
+ 1. Check in.
 
-==== New release ===
+==== New release ====
 When the trunk is deemed stable, the release branch is upgraded to match its version:
-  # Change directory to a working copy of the release branch.
-  # Change the version label (remove "wip")
+ 1. Change directory to a working copy of the release branch.
+ 1. Change the version label (remove "wip")
 {{{
 svn merge svn://pulkomandy.tk/GrafX2/branches/trunk/
 }}}
-  # Solve any conflicts.
-  # Check in.
+ 1. Solve any conflicts.
+ 1. Check in.
 When done, you generally change the version label in trunk by adding 0.1 and "wip".