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

Re: READ ME: working copy ickiness!

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-01-14 15:56:23 CET

Todd Mokros <niltsiar@neo.rr.com> writes:

> On Mon, 2003-01-13 at 18:30, Ben Collins-Sussman wrote:
> > *** The workaround, for now: ***
> >
> > The simple solution is just to checkout a fresh working copy of
> > /trunk.
> >
> > The repair solution:
>
> svn revert on the problem files seems to be a slightly easier solution,
> if you don't have any local changes. At least it worked for me.

'svn revert' just copies the text-base on top of the working file.
But the whole point here is that the text-bases are *wrong*. They're
wrong in the sense that the text-bases no longer are identical to
what's in the repository, which is our cardinal rule.

  1. Certain files with eol-style "native" had text-bases with CRLF,
      which is always wrong. "native" eol-style always means LF style
      in the repository (and text-base).

  2. Certain files with eol-style "CRLF" had text-bases as LF, which
      is equally wrong.

So 'svn revert' only makes the problem worse. It means that if you
commit a change to those particular files, the diff sent to the
repository will likely be completely bogus.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jan 14 15:59:30 2003

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