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

Re: Merge bug(let)

From: Branko Čibej <brane_at_xbc.nu>
Date: 2003-02-26 20:33:09 CET

Philip Martin wrote:

>I don't know
>exactly how to reproduce this, I haven't been able to do it on my Unix
>box. I *think* it can be done on a Windows box by committing a file
>with extra CR characters, something like
>
> fooCRCRLF
> barCRCRLF
>
>which gets converted to
>
> fooCRLF
> barCRLF
>
>before being sent to the repository. From what Bill has told me
>that's how it happened in the past.
>
I think it's even simpler than that; here's what happened with
win-tests.py and build/win32/build_neon.bat: both files were originally
committed with CRLF line endings and _without_ the svn:eol-style
property. Then only the property was changed. Upon commit, the WC
noticed the prop change, but decided there were no text changes and
therefore didn't send new (correctly converted) text to the server.

Of course, the WC was right as far as it goes -- there *were* no text
changes in those files! But changing svn:eol-style *could* result in a
(virtual) text change, even when nobody touched the text itself. To fix
that bug, the WC crawler should probably be told to assume that any
change to svn:eol-style (and possibly svn:keywords) is a potential text
change.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 26 20:34:08 2003

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