Edgewall Software

Changes between Initial Version and Version 1 of SvnMerge


Ignore:
Timestamp:
Mar 12, 2007, 3:50:53 PM (13 years ago)
Author:
Christian Boos
Comment:

short introduction for svnmerge

Legend:

Unmodified
Added
Removed
Modified
  • SvnMerge

    v1 v1  
     1= `svnmerge` script =
     2
     3This is a python script recording merge operations across branches.
     4
     5It enables one to see the ''available'' ranges of changesets that can be merged (`svnmerge avail`) and then actually ''merge'' them (`svnmerge merge`). Revisions that should be prevented from being merged can be explicitly ''blocked'' (`svnmerge block`).
     6
     7
     8We use `svnmerge` for backporting changes from trunk to the [source:branches/0.10-stable stable] branch, and also to port trunk changes to [source:sandbox sandboxed] branches.
     9
     10Similar functionalities are expected to be available in Subversion itself, with version 1.5 (or later).
     11
     12----
     13See also: SvnWiki:Svnmerge.py