TeamForge tools Plan and track anything Document your work Work on tasks Manage source code Discuss stuff Report on project activity Release products Contribute knowledge Build and test Run a project

Does CollabNet TeamForge support merge tracking?

The Subversion repositories that are installed with CollabNet TeamForge run on Subversion 1.5, which supports merge tracking.

Any Subversion 1.5 servers you have integrated with CollabNet TeamForge support merge tracking. If you need the merge tracking feature and your Subversion server is running a version earlier than Subversion 1.5, you must upgrade to Subversion 1.5 to get this functionality.

If you used svnmerge.py (http://www.orcaware.com/svn/wiki/Svnmerge.py) to do merge tracking before Subversion 1.5, and you want to convert your svnmerge.py data to the Subversion 1.5 merge tracking data format, CollabNet provides a migration tool, linked below.

Related questions
What software configuration management tools are available in CollabNet TeamForge ?
More information
Version Control with Subversion
Version Management with CVS (The Cederqvist)
Perforce technical documentation
Migration tool