Re: cvs merging - conflict

[Paul Sander]

>--- Forwarded mail from address@hidden

>On Thu, 17 Jun 2004, Feldmann, Rick wrote:

>> Date: Thu, 17 Jun 2004 11:53:55 -0400
>> From: "Feldmann, Rick" <address@hidden>
>> To: 'Kaz Kylheku' <address@hidden>
>> Cc: "'address@hidden'" <address@hidden>
>> Subject: RE: cvs merging - conflict
>> 
>> Kaz,
>> 
>> Thanks for the reply.  Nice explanation of the differences.  As for white
>> space, I'm not asking for the machine to blindly throw white space away, I'm
>> asking for the ability to tell the machine to throw away white space.  It
>> doesn't even have to be the default, just an option.  

>The problem with that is that the project now has users who are
>deciding to use an option. So from the configuration manager's point of
>view, he has a machine (system + programmers) that is doing silly
>things. :)

>The whitespace truly has to not matter, no matter where it occurs.

>In your case, you are dealing with XML, in which whitespace does
>matter. Not everywhere, of course, but in some contexts, like the
>data itself:

><foo> </foo> is different from <foo></foo>

><foo key="value "> is different from <foo key="value">

>There is no telling how such differences will affect some process that
>uses that XML as input.

All the more reason to provide a hook to insert a merge tool that is
senstitive to the data type.  But that's a different thread...

>--- End of forwarded message from address@hidden