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

Re: svn merge/diff problem

From: Ph. Marek <philipp.marek_at_bmlv.gv.at>
Date: 2004-03-25 10:44:27 CET

> Hi,
> This happens all the time, and the differences between the files are
> usually pretty trivial, so
> it must be something in my installation / tools that I'm overlooking...
>
> This makes the merging of course very difficult.. The strange thing is
> that simply executing cygwin's
> external diff command, creates the correct diffs... I'm running
> subversion 1.0 on cygwin / windows xp (client)
> and SuSE 9 on the server side..
>
> Anybody any ideas where I can look to nail this problem down? I'll have
> to start merging
> lots of branches soon :-(
You most probably have a line-ending problem. CR vs. LF vs. CRLF somewhere.
Have a look at the book, the chapter handling svn:eol-style.

Regards

Phil

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 25 10:45:10 2004

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