subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philip Martin <philip.mar...@wandisco.com>
Subject Re: Strange diffs after rsync copying of working copy
Date Fri, 03 Feb 2012 15:57:51 GMT
Johan Holmberg <holmberg@iar.se> writes:

> Yes, in one case I get a difference for the $Id$ line (from "svn diff"):
>
>   -$Id:$
>   +$Id$

OK. I think the file in the repository has '$Id:$' instead of '$Id$' for
the keyword.  Committing the file should fix the problem.

> and in the other files the "svn diff" show a difference on line
> endings (Windows .vs. UNIX). But the files have svn:eol-style native
> set, and appear as normal UNIX text files in the working copies.

A similar problem here, the file in the repository should have \n line
endings but the file has some \r\n line endings.  Once again committing
the file should fix the problem (although mixed line endings may cause
the commit to fail and require you to make them consistent before
committing).

-- 
Philip

Mime
View raw message