truMerge?
truMerge is a merge helper tool that combines true rename functionality with Subversion merge, in order to handle tree conflicts more reliably and effectively.
Do not be fooled by the name: truMerge is by no means "the truth" in merging (we believe that in due course, Subversion will blow truMerge out of the water). However, we find it useful and to be a significant improvement over Subversion's current merge for archives that undergo a lot of tree restructuring.
The latest snapshots can be found here.
The so-called "cacheless" version of truMerge is finally very close to release: it is a complete replacement for svn's native merge, supporting merge tracking, reintegration, record-only merging, and, obviously, tree-conflict handling. The first release candidate is now out, providing a significant performance improvement over earlier versions.
Release candidates can be found here.
How to get involved
Any help is welcome!
As it is now, truMerge is already very helpful, but it is neither without problems nor without limitations (most notable, it was developed for Windows XP, and will not run on other platforms; porting should not be difficult, because truMerge is completely written in Perl).
Here are some suggestions to get started:
- Test. Download truMerge, try it out and test the tool. If you find problems, please report them.
- Discuss. Share your experiences with other users.
- Contribute. Fix problems that you or others find (here is a list of open issues )
- Promote. Tell others about this tool.
Default Project Content
China
Korea
Japan
Korea
Japan