Changes between Version 1 and Version 2 of Develop/SourceControl


Ignore:
Timestamp:
08/10/2016 13:14:33 (4 years ago)
Author:
pulkomandy
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Develop/SourceControl

    v1 v2  
    3131This creates a working copy in (new) directory _stable_.
    3232
    33 ==== Reporting fixes from release into trunk ===
     33==== Reporting fixes from release into trunk ====
    3434After 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:
    35   # change directory to a working copy of trunk, and type:
     35 1. change directory to a working copy of trunk, and type:
    3636{{{
    3737svn merge svn://pulkomandy.tk/GrafX2/branches/release/
    3838}}}
    39   # Solve any conflicts (sometimes the fixes are already applied but differently)
    40   # Check in.
     39 1. Solve any conflicts (sometimes the fixes are already applied but differently)
     40 1. Check in.
    4141
    42 ==== New release ===
     42==== New release ====
    4343When the trunk is deemed stable, the release branch is upgraded to match its version:
    44   # Change directory to a working copy of the release branch.
    45   # Change the version label (remove "wip")
     44 1. Change directory to a working copy of the release branch.
     45 1. Change the version label (remove "wip")
    4646{{{
    4747svn merge svn://pulkomandy.tk/GrafX2/branches/trunk/
    4848}}}
    49   # Solve any conflicts.
    50   # Check in.
     49 1. Solve any conflicts.
     50 1. Check in.
    5151When done, you generally change the version label in trunk by adding 0.1 and "wip".
    5252