[cvsnt] Re: Merging Files and Diffs?

[Tony Hoyle]

Trevor Leybourne wrote:
> 1. If there are other changes that do conflict, does it still merge the 
> things it thinks it can and then report what it cant? (ie: therefore in 
> WinMerge you only see the things that CVS couldn't merge)

Yes, pretty much.  OTOH it chooses to conflict when there's any 
ambiguity just to be safe, so sometimes you see 'obvious' merges 
conflicting.

> 2. Or does it call the merge application with the 2 different and unmodified 
> files? (ie: In WinMerge you see ALL differences and CVSNT will not have 
> merged anything automatically)

It doesn't call any merge application.

> 3. Can automatic merging be switched off?

No.  It's fundamental to the operation of the system.  Marking the files 
as binary will stop merging it but mean that realistically only one 
person can ever work on the file at at time - defeating the main 
advantage of things like CVS.

> I am asking because one of our development teams is complaining that lines 
> of code are disappearing when merging is occuring. We are using Visual 
> Studio and a developer worked on a form which automatically generated some 
> code in a c# file. This was commited. Another developer modified it as well 
> and when the code was merged, some lines of generated code were not shown in 
> either of the WinMerge panels.

Did both people shut down visual studio before committing?  If not, the 
changes may never have existed on the disk.

It may also be a WinMerge issue rather than a CVS one.

Tony