Merge Tracking

"Make merging changes simple."

Subversion's own Merge Tracking

Early development of Subversion's own merge tracking support is currently underway. Email the development list if you're interested in participating in its definition or implementation.

A prototype of the above exists which is roughly equivalent in functionality to svnmerge.py. The protoype adds sqlite as a dependency, and supports both the FSFS and BerkeleyDB Subversion file system backends. Tasks remaining for the initial implementation are tracked here.

External Merge Tracking

Tools built on top of Subversion