[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-02-11 19:46:02 CET

"Thomas Börkel" <tbo@ap-ag.com> writes:

> "Philip Martin" <philip@codematters.co.uk> wrote in message
> news:877jlj3tfm.fsf@codematters.co.uk...
>
>> Subversion will do this for each hunk that makes up the diff, see one
>> of my earlier mails for an five-line example that is more like the
>> original report.
>
> I still think, that it's not OK that Subversion silently does not remove a
> block it cannot find in the trunk.

I think it's a matter of opinion whether the behaviour is right or
wrong. If you don't like the Subversion behaviour there is diff3-cmd,
either at the command line or in your config file, that will allow you
to use GNU diff3.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Feb 11 19:47:26 2005

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