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

Re: svn resolve: just what does it do?

From: William Uther <will+_at_cs.cmu.edu>
Date: 2002-03-16 00:24:48 CET

On 15/3/02 4:09 PM, "Bill Tutt" <rassilon@lyra.org> wrote:

> Now we just need a spec for how you categorize input files so that you
> know which merge tool to run. How does the following sound for a decent
> start?
>
> The idea here is that the following checks would be performed in the
> order listed:
>
> * Files based on a file pattern. (i.e. *.doc, *.xml, etc...)
> * Text files invoking your standard text file 3-way merge resolution UI.

I'd prefer something that used the svn:mime-type property. Possibly with a
way to have the svn:mime-type automagically set (based on a file pattern?)
when you add a file.

\x/ill :-}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 16 00:25:48 2002

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