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

Re: Strange diffs after rsync copying of working copy

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 03 Feb 2012 16:54:14 +0000

Johan Holmberg <holmberg_at_iar.se> writes:

>> 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).
>
> But here my working copy files are already UNIX text files (no \r\n
> line endings). And Subversion refuses to commit unchanges
> files.

Are you trying to commit when status shows nothing (that won't work) or
when status shows the files as modified? I'd expect the latter to work.

> Perhaps I should:
>
> - temporarily remove the "svn:eol-style native" settings + commit
> - then remove any \r\n + commit
> - finally add back the "svn:eol-style native" attribute
>
> Or is there some easier way? (this three-step process seemed to work
> for the first file I tried).

Add a blank line? You could use 'svnmucc put' but doing that is the
sort of thing that causes the problem in the first place.

-- 
Philip
Received on 2012-02-03 17:54:52 CET

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