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

Re: Odd Conflicts (EOL issues) in repo converted from VSS

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2007-01-30 18:13:22 CET

Damian Sinclair wrote:
> I branched from one of the imported lines, checked that the
> svn:eol-style property was set to native on the server and client,
> checked out a working copy and added a single line comment. I then did
> an svn diff on my working copy and it showed that every single line had
> changed. On commit and subsequent comparison of revisions, the same
> thing is shown and this results in a conflict on any future merge of
> that change to another branch.
>

So an "svn proplist -v <file>" in your working copy shows both
"svn:eol-style : native" and "svn:mime-type : text/plain"? I'm not sure
I follow what you mean by "branched from one of the imported lines".

What happens if you do an svn diff without modifying the file at all?
Are you sure that your text editor isn't changing the line endings also?

toby

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 30 18:13:51 2007

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