| Version 1 (modified by , 17 years ago) ( diff ) |
|---|
svnmerge script
This is a python script recording merge operations across branches.
It 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).
We use svnmerge for backporting changes from trunk to the stable branch, and also to port trunk changes to sandboxed branches.
Similar functionalities are expected to be available in Subversion itself, with version 1.5 (or later).
See also: SvnWiki:Svnmerge.py
Note:
See TracWiki
for help on using the wiki.
