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

Re: svn diff and binary files

From: Vineet Kumar <vineet_at_doorstop.net>
Date: 2007-06-30 01:31:36 CEST

* Daniel Noll (daniel@nuix.com) [070627 23:27]:
> On Thursday 28 June 2007 16:16:37 Karl Fogel wrote:
> > Daniel Noll <daniel@nuix.com> writes:
> > > I'm experiencing some strange behaviour. After converting our CVS
> > > repository over to Subversion, some of the files which were marked as
> > > binary on one side did not end up being marked as binary on the other.
> > > But even after setting the MIME type explicitly, I'm not getting the
> > > behaviour I would expect.
> >
> > You don't say how you converted your repository. Did you use
> > cvs2svn (cvs2svn.tigris.org)?
>
> Yeah.
>
> I think I've discovered part of the issue, which was stray svn:eol-style
> properties on some of the affected files. No idea what that was doing on
> binary files, but it was there, and I removed it now, fixing some of the
> files.

Afaik, cvs2svn looks at the only clue it has, which is whether the file
has "-kb" in the CVS repository. Probably (some of) these PNGs didn't,
and so cvs2svn imported them as text (since that's what they were in the
CVS repository). You might not notice the corruption on CVS if you were
working in an all LF environment, but once you tried to do a checkout on
windows, you'd have seen the CRLF corruption there too.

Were you using subversion with mixed LF/CRLF clients? What was the
svn:eol-style set to? Same as with CVS: if you were working in an
all-LF environment you probably wouldn't notice the corruption.

The biggest difference between CVS and subversion in this area is how
they determine whether to merge when concurrent edits occur: subversion
looks for an svn:mime-type beginning with "text/", whereas CVS
determines it based on the "-kb" option.

Vineet

-- 
http://www.doorstop.net/
-- 
#include<stdio.h>
int main() {
    puts("Reader! Think not that \n"
         "technical information \n"
         "ought not be called speech;");
    return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 30 01:31:44 2007

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