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

Re: Subversion conflict resolution

From: Sjoerd Tieleman <Sjoerd.Tieleman_at_phil.uu.nl>
Date: 2005-11-22 10:24:16 CET

On Nov 21, 2005, at 5:33 PM, kfogel@collab.net wrote:

> Sjoerd Tieleman <Sjoerd.Tieleman@phil.uu.nl> writes:
>> So, this is kind of a bummer, because as I understand, Subversion
>> sees
>> everything not marked as "text/*" as a binary file, and as such diff
>> tools are not called. So, this means that even if you specify in your
>> Subversion config file that your "special diff script" should
>> always be
>> used, you are still left out in the cold for files with other types
>> (such as "application/xml"). So, for Subversion to be able to do
>> this,
>> the hard-coded notion of not *ever* performing a diff/merge when
>> we have
>> something other than "text/*" should have to be replaced with
>> something
>> more elegent (which could be turned off by default and only turned on
>> by adding something to your config file, at the users discretion),
>> but
>> which allows "experienced" users to perform diffs/merges on anything
>> other than text types.
> Yes, absolutely, this is a real problem.
> There was a huge discussion here recently about the right way to fix
> this, but after crawling around the archives for twenty minutes, I
> still can't find it :-(. I must be searching on the wrong keywords;
> does anyone remember the thread?


> Meanwhile, if you have time, you could perform a valuable service by
> a) filing this as an issue (we don't seem to have one)
> b) tracking down those mail threads and linking to them from the
> issue

I've done the first part, it's filed under issue #2447. Someone
should probably tweak the subcomponent and severity (seeing as this
was my first issue report for Subversion). I'd be more than happy to
discuss the possible resolutions/ideas/implementations, however, I'm
not much of a programmer, so I probably can't fix them myself. :-)


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 22 10:25:11 2005

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