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

Re: Text-base differs from wc, svn st doesn't notice

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2003-11-25 04:23:15 CET

Lele Gaifax <lele@nautilus.homeip.net> writes:

> $ svn st
> M u_MainDM.pas
> M u_AnalisiModelloSingoleOperazioni.pas
> M u_AnalisiModelloBase.pas
> M u_MainDM.dfm
> M u_AnalisiModelloSingoleOperazioni.dfm
> $ svn st u_AnalisiModelloBase.pas
> M 1986 1986 lele u_AnalisiModelloBase.pas
> $ svn st -v u_AnalisiModelloBase.dfm
> 1980 1296 lele u_AnalisiModelloBase.dfm
> $ cmp u_AnalisiModelloBase.dfm .svn/text-base/u_AnalisiModelloBase.dfm.svn-base
> u_AnalisiModelloBase.dfm .svn/text-base/u_AnalisiModelloBase.dfm.svn-base differ: byte 16567, line 595
>
> See? That DFM is actually corrupted (for whatever reason, see below),
> but neither "svn st" nor "svn diff" signal the fact. The checksum in
> .svn/entries matches the .svn-base version, and luckily it's the
> version I get fetching out a fresh copy from the repository.

First, I'm ignorant of Delphi thingamabobs. So sorry if I make false
assumptions.

Do you have any svn:keywords set on those files that might be
expanded? If the newline styles are set to CRLF, that makes me think
that these might be human-readable files. Is that not true? Do these
files every contain binary data? What does 'diff' (not 'svn diff',
just 'diff') show you when comparing the base and working files?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 25 04:24:24 2003

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