Suggestion for better, less confusing merge filenames

[Tobias Knauss]

Currently, the filenames during merging are
filename.working (mine)
filename.merge-left.rABCD (base)
filename.merge-right.rEFGH (theirs)

I am using BeyondCompare 4 for file comparison and merge, which is more comfortable than TortoiseMerge. BC4 shows the "mine" on the left top, "theirs" on the right top, "base" on the center top, and "merged" on the bottom. This is fine, but the filenames you use are confusing. What is "left" and "right"? This has no useful meaning.

I suggest that you use
.working --> .merge-mine
.merge-left.rABCD --> .merge-base
.merge-right.rEFGH --> .merge-theirs

This change should be easy to do and you can keep searching for the old names for backwards compatibility.

[Stefan]

The filenames are generated by the svn library, not TSVN. If you really like to change those, you'd have to ask the svn developers to do that.
http://subversion.apache.org/mailing-lists.html