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

Re: Some questions...

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-07-16 19:32:58 CEST

Tony Hoyle <tmh@nodomain.org> writes:

> Ben Collins-Sussman wrote:
> > The Subversion *client* (libsvn_wc) looks at metadata attached to
> > files in the working copy, and distingusishes between text and
> > binary files. Text files are considered "okay" for contextual
> > merging (during an update), eol-translation, and
> > keyword-expansion. Binary files aren't eligible for these things.
>
> We're just wildly agreeing here... It would be silly if the server
> cared about text/binary (CVS does it this way too although its sucky
> diffing algorythm tends hide the fact). The client, though, is
> responsible for turning the user file into something the protocol
> understands... Since UCS2 == Text then it should be the clients'
> responsibility to then encode this in UTF8 for transmisison/storage,
> and back again on an update, which is similar to eol-translation (but
> with more impact on the filesize)... With that you get keyword
> expansion and diffing for free.

What? You're advocating munging the *entire* contents of a file back
and forth? I don't understand why you want to do this.

Either the contents of a file can be contextually merged, or they
can't. *You* decide that, mark the file appopriately with svn
metadata, and let the svn client either do it or not.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 16 19:35:14 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.