Using the Subversion TortoiseSVN Merge Algorithm in a .NET Project

Question

I have a whole group of pairs of files that have subtle differences. We use subversion for the source control, and I like the Merge / Diff utility that ships with TortoiseSVN for windows. And I can use this utility to manually compare / merge two files together. My question is this: how can I programmatically merge two files together in the same way as the program does (and ignore flag files that have conflicts)?

Answer 1

It may help: Automate TortoiseMerge

Answer 2

I would suggest using one of the .NET libraries that support the established merge algorithm, for example, the one suggested in this question: Any decent text decomposition / merge mechanism for .NET?

I don’t know about quality, I also came across this: http://razor.occams.info/code/diff/

Answer 3

, :

• Sharp SVN, ANKH Visual Studio. ,
• DotSVN - '.Net- Subversion'
• , Google Diff Match Patch.

, , . , Google .

, .

Answer 4

, , , , , , , , (, Subversion).

, , ? (# - , , )

--- File #1 ------------------------        --- File #2 ------------------------
1   This is the first line                  1   This is the first line
2   This is the second line                 2   This is the second line
3   This is the third line
4   This is the fourth line                 3   This is the fourth line
                                            4   This is the fifth line
5   This is the sixth line                  5   This is the sixth line

, ?