close Warning: Can't synchronize with repository "(default)" (/var/svn/tolp does not appear to be a Subversion repository.). Look in the Trac log for more information.

Changes between Version 3 and Version 4 of TolDevelopment


Ignore:
Timestamp:
Feb 25, 2009, 2:59:33 PM (16 years ago)
Author:
Víctor de Buen Remiro
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • TolDevelopment

    v3 v4  
    2828The recommended interface for Linux is [http://rapidsvn.tigris.org/ RapidSVN] using [http://www.tol-project.org:8081 meld] as diff tool.
    2929
    30 === Creating a branch for official release ===
     30=== Starting ===
     31
     32
     33=== Creating a branch ===
    3134When trunk version is released as Official version a branch must be created to allow parallel evolution.
     35Another posible use of branches is trying new features.
    3236
    33  1. Moves to the tolp root of your local copy
    34  1. Makes the remote branch as a copy of current trunk, for example
     37 1. Move to the tolp root of your local copy
     38 1. Update remote changes
     39 1. Comit all local changes
     40 1. Make the remote branch as a copy of current trunk, for example
    3541{{{
    3642svn copy https://www.tol-project.org/svn/tolp/trunk  \
    … …  
    4450}}}
    4551
     52=== Recovering a trying branch to trunk ===
     53
     54 1. Move to the tolp root of your local copy
     55 1. Update remote changes in both trunk and trying branch
     56 1. Comit all local changes in both trunk and trying branch
     57 1. Merge changes from in both trying branch to trunk
     58{{{
     59svn merge https://www.tol-project.org/svn/tolp/branches/my_trying_branch https://www.tol-project.org/svn/tolp/trunk trunk
     60}}
     61 1. If there is a conflict you will be asked in order to select one of two versions or pospone the decision. So you must monitorice the console from time to time.
     62