Introduction

Using Subversion can be a bit of a challenge. This document attempts to describe the interaction between release branches and the trunk.

The best way to work with a release branch and trunk is to make all changes for the release in the release branch and then merge them back into the trunk. NOT the other way around. There are two reasons for this.:

  1. The creation of the release branch provides a known point in time. This provides a reference point which allows us to know whether a change has happened either before or after the branch was made.
  2. The trunk can contain changes that should not be in the release. If you were to make changes in the trunk and then merge them into the release, then you could also merge in changes that weren't intended for the release.

Web Access to Subversion

http://chianti.ucsd.edu/svn/

Basic Procedure

SVN_Release_Branches (last edited 2009-02-12 01:03:09 by localhost)

Funding for Cytoscape is provided by a federal grant from the U.S. National Institute of General Medical Sciences (NIGMS) of the Na tional Institutes of Health (NIH) under award number GM070743-01. Corporate funding is provided through a contract from Unilever PLC.

MoinMoin Appliance - Powered by TurnKey Linux