[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: Lele Gaifax <lele_at_nautilus.homeip.net>
Date: 2003-11-25 11:39:31 CET

>>>>> "C" == C Michael Pilato <cmpilato@collab.net> writes:

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

Delphi5 introduced the capability of storing its DFMs in a textual
format(*). "Binary" (such as a bitmap) object are stored in base64 (or
something similar), simpler values in plain text. The format does not
offer any kind of comment, so no, it's not possible to use expandable
keywords. And the D5 parser expects CRLFs, otherwise it raises a "line
too long" exception. So, no svn:keywords and svn:eol-style=CRLF.

It something like:

    object Panel3: TPanel
      Left = 0
      Top = 0
      Width = 85
      Height = 63
      Align = alLeft
      BevelOuter = bvNone
      Caption = ' '
      TabOrder = 1
      object BitBtn1: TBitBtn
        Left = 7
        Top = 6
        Width = 72
        Height = 53
        Caption = 'Partiti!'
        TabOrder = 0
        OnClick = BitBtn1Click
        Glyph.Data = {
          040000000 .... 3333333}
        Layout = blGlyphTop
        NumGlyphs = 2

ciao, lele.

(*) There's been a time when I used a combination of CVS
wrappers+dosemu+D3 convert.exe to automagically store my DFM in
textual form *within* the repository kept under *real* OS, translating
on-the-fly to/from binary and text representation at checkout/checkin
time.... Luckily, that's gone ;-)

nickname: Lele Gaifax	| Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas	| comincerò ad aver paura di chi mi copia.
email: lele@seldati.it	|		-- Fortunato Depero, 1929.
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 25 11:39:27 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.