ThreeWayMerge.Run() crashes when IsBaseless is set to true

Hi,

I found James Manning's blog as an example of the ThreeWayMerge. (http://blogs.msdn.com/jmanning/archive/2005/11/06/489699.aspx) Just when I thought I figured it out, something else comes up.

Suppose I have two similar, non-binary files that I wish to merge. Neither files are in source control, therefore have no common code base. The resulting merge file will be checked into the repository. I thought that by setting IsBaseless to true would perform simple two-way merge. Unfortunately, it crashes when I make this change. What am I doing wrong?

Is the ThreeWayMerge the proper tool to do this merge? If it is not, what do I use and how is it to be used?

Thanks.

Patrick

[861 byte] By [PatrickR] at [2007-12-22]

«« Loop til you drop
»» Get all classes from a Project?

# 1

Patrick,

Can you provide some additional information about what "crashes" means?

I assume this means an exception is thrown (and likely is unhandled in your application). Can you capture the exception and include the exception details (type, callstack, message, inner exceptions, etc) and a sample snippet of the code you are trying to execute.

Thanks.

Robert

RobertHorvickMSFT at 2007-8-30 >