Pete Hurst wrote:
> Hi,
>
> I'm still relatively new to SVN in general. I set it up on the server
> at work when another developer started, and have found it very useful
> for a lot of different reasons.
>
> One problem keeps coming back to bite me, though. Now I'm *assuming*
> it's a problem with TSVN rather than something in SVN itself.
> Basically: after I've resolved a conflict between two files and
> committed my changes, the resultant file has been trashed by
> whitespace. *All* lines in the file have had an extra blank line
> inserted in between.
>
> I've tried reverting the changes, then attempting to perform the merge
> again. Same problem.
>
> There was no extra white-space showing when I was resolving the
> conflict, so why would it appear after the commit?
>
> I'm guessing it has *something* to do with Windows vs Unix line
> endings, however it's really not clear what I should be doing about
> it.
You don't tell us whether you see those extra blank lines on Windows or
on another machine running Linux. I'm guessing the latter.
In that case, you have to set the svn:eol-style property to either
'native', 'CR', 'CRLF' or 'LF' depending on which line endings you want
to have in the file.
Because if you don't have this set, a merge can set the EOL's of your
file wrong (according to what you expect). If you have set the property,
SVN makes sure that the EOLs match the setting.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Nov 5 21:32:25 2007