[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug in merge (repro included)

From: Max Bowsher <maxb_at_ukf.net>
Date: 2005-02-07 17:47:53 CET

Sander Striker wrote:
>> From: Ben Collins-Sussman [mailto:sussman@collab.net]
>> Sent: Thursday, February 03, 2005 5:47 PM
>
>> Sander Striker: what do you think? Is this a bug in our diff3
>> algorithm?
>
> Not nessecarily. Our range of conflict is smaller. We could make this
> configurable. It only affects the output function, calculating what
> the common parts are doesn't change.
>
>> Thomas says that GNU diff3 produces a conflict with these files also.
>
> GNU diff3 is not the same as Subversion. The results may differ.
> I don't feel it is wrong per se.

I agree we don't have to be exactly the same.

But I think failing to apply several lines of changes, and not raising any
kind of conflict is a definite bug?

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 7 17:49:26 2005

This is an archived mail posted to the Subversion Dev mailing list.