Hi,
there seems to be a problem with subversions behaviour concerning the
diffing/merging of (text-)files marked as binary.
Ok, I have a file that is clearly marked as binary in two branches:
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn/4
$ svn pl -v svn://pkgsvnp1/Personal/bernharm/test/zweige/pn/3/V0002.kbs
Properties on 'svn://pkgsvnp1/Personal/bernharm/test/zweige/pn/3/
V0002.kbs':
svn:mime-type : application/octet-stream
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn/4
$ svn pl -v svn://pkgsvnp1/Personal/bernharm/test/zweige/pn/4/V0002.kbs
Properties on 'svn://pkgsvnp1/Personal/bernharm/test/zweige/pn/4/
V0002.kbs':
svn:mime-type : application/octet-stream
Now I changed the contents of the file in Rev. 11096 (after the mime-
type had been set):
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn
$ svn log -v -r11096
------------------------------------------------------------------------
r11096 | bernharm | 2007-03-09 09:32:29 +0100 (Fri, 09 Mar 2007) |
1 line
Changed paths:
M /Personal/bernharm/test/zweige/pn/3/V0002.kbs
And diff tells me that it can't show me differences, because the file
is 'binary', which is just what i would expect.
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn
$ svn diff -r11095:11096 /cygdrive/c/maxbernhardt/cyg/test/zweige/
pn/3/V0002.kbs
Index: /cygdrive/c/maxbernhardt/cyg/test/zweige/pn/3/V0002.kbs
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
BUT: Now I try a merge. And merge just silently merges the two files
totally ignoring the mime-type. All the documentation says that merge
should behave just like diff, which is why I set the property in the
first place.
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn/4
$ svn merge -r 11095:11096 svn://pkgsvnp1/Personal/bernharm/test/zweige/pn/3
.
U V0002.kbs
BERNHMAX@GNP3839 /cygdrive/c/maxbernhardt/cyg/test/zweige/pn/4
$ svn st
M V0002.kbs
I think this is a bug. I run a stock 1.4.2 Cygwin Binary as client and
a stock HPUX 1.3.2 server.
Now since setting the mime-type doesn't seem to work, is there any
other way to exclude textfiles from merges?
-- Max
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 9 10:04:46 2007