Karl Fogel <kfogel@newton.ch.collab.net> writes:
> Ben Collins-Sussman <sussman@collab.net> writes:
> > If a file has changed on the server, svn simply applies a patch to the
> > working copy file, in-place, using diff3. That's how it preserves
> > local modifications. I guess we could make this more complex... make
> > a tmp copy of the working file, patch it, delete the original, copy
> > the tmp file back?
>
> But isn't that what we do (the second way, I mean)? We have to anyway
> to deal with keyword and eol untranslation... We don't do the "delete
> the original" step, of course, we just rename over the original.
Hey, wait, you're right! Ever since we started dealing with
keyword/eol translations.... do we do this all the time? If a file
has *no* translation properties attached to it, does this still
happen? We need to reread svn_wc_install_file().
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 7 18:21:23 2002