Re: isn't variance adjusted patching horribly dangerous?

Philip Martin wrote:
>
> Tom's example was contrived to give a conflict, I can contrive one
> that does not
>
> Original Change 1 Change 2
>
> const char*email[]={ const char*email[]={ const char*email[]={
> "foo@bar.com", "foo@bar.com", "foo@bar.com",
> "zig@zag.com", "new_zig@zag.com", "zig@zag.com",
> "bif@bof.com", "bif@bof.com", "new_bif@bof.com",
> NULL NULL NULL
> }; }; };
>

I'd like the system to generate a conflict here, I really do. Wouldn't you?

>
>>I would refrain from using the system that would throw the context
>>away.
>
>
> Are you using Subversion?
>

I have to be careful then. After experiencing third-party source maintenance with CVS, it looks like I trust version control
systems too much. CVS 1.11.5 that I use doesn't work this way, it surely generates a conflict on merge. Will Subversion generate
a conflict if the external diff is used? I really hope to hear "yes".
Thanks!

Sergey.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 02:10:43 2003