Re: Merge bug(let)

Branko ÄŒibej <brane@xbc.nu> writes:

> 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.

Is that a Windows specific bug? If I do that on Unix the file gets
converted when I commit the property change

$ svnadmin create repo
$ svn co file://`pwd`/repo wc
$ printf 'abc\r\n' > wc/foo
$ svn add wc/foo
$ svn ci wc
$ od -c wc/foo
0000000 a b c \r \n
0000005
$ svn ps svn:eol-style native wc/foo
$ od -c wc/foo
0000000 a b c \r \n
0000005
$ svn ci wc
$ od -c wc/foo
0000000 a b c \n
0000004
$ rm -rf wc
$ svn co file://`pwd`/repo wc
$ od -c wc/.svn/text-base/foo.svn-base
0000000 a b c \n
0000004

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org