subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thorsten Schöning <tschoen...@am-soft.de>
Subject Re: svn:eol-style native and reintegrate merge
Date Fri, 05 Oct 2012 09:30:45 GMT
Guten Tag James French,
am Freitag, 5. Oktober 2012 um 10:58 schrieben Sie:

> Thanks Thorsten for your reply, replying here for simplicity.

Inline quotes are simple...

> When
> I diff with --ignore-eol-style only the svn:eol-style native
> property changes show up. Why is the diff showing line changes? I
> guess its because its telling me that the internal data has been
> changed to LF line endings.

Correct.

> Fair enough. Still seems weird that a
> working copy diff should show this though.

What do you mean with working copy diff? The file didn't change for
Tortoise, as eol-style: native "reverts" the LF-changes in the repo
transparantly in your working copy. That's what you wanted.

> I still wonder whether
> this whole native eol thing is going to bite me in the arse later
> and cause a load of conflicts that rattle around the codebase for
> ages (over the years svn has unfortunately taught me to expect this kind of stuff).

It may, at least with everything which works on bytes and different
environment, like hashes, signatures, reading for some reason from
your versioned files with some tools etc. Those things will become
error prone, as depending on your environment you may work on
different line endings.

> What I don't accept though is that svn 1.7 is performing correctly.
> The merge *physically changed* all the source files in my working
> copy to LF line endings on a windows boc. That *cannot* be right.

But that's exactly what the documentation says Subversion will do. :-)

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon.............030-2 1001-310
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow


Mime
View raw message