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

Re: Locking functional spec: read-only WC

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-10-14 12:27:55 CEST

"Ph. Marek" wrote:
> > text files which are normally mergeable can sometimes be
> > modified in hard-to-merge ways.
> But that depends entirely on the merge-tools.
> Your example given I'd expect the file to have a mime-type of text/xml
(or
> some such) and then svn should do the merge by using a special program
for
> xml.
>
> To be honest, I'd believe even tiff-pictures to be mergeable using the
correct
> algorithms and programs - eg. by dumping them in ppm(5) format with
every
> pixel on its line ...

Sorry, that argument won't wash. While it may be theoretically possible
to produce a merge tool for every imaginable file type, in practice most
people don't have them, which is why they want locking.

Also, the whole point about using text-based files format is that they
are easy to edit using any text editor, which makes them accessible to
anyone. Relying on special purpose merge tools negates that
accessibility.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 12:31:40 2004

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