| | 1 | = `svnmerge` script = |
| | 2 | |
| | 3 | This is a python script recording merge operations across branches. |
| | 4 | |
| | 5 | 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`). |
| | 6 | |
| | 7 | |
| | 8 | We 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 | |
| | 10 | Similar functionalities are expected to be available in Subversion itself, with version 1.5 (or later). |
| | 11 | |
| | 12 | ---- |
| | 13 | See also: SvnWiki:Svnmerge.py |
