On Wed, Aug 31, 2011 at 4:14 AM, Ulrich Eckhardt
<ulrich.eckhardt_at_dominolaser.com> wrote:
> I.e. the whole file was marked as conflicted? This is an effect of conflicting
> line endings, as I initially mentioned. Try transcoding the file's line
> endings using dos2unix or unix2dos before merging and back afterwards. If the
> changes are then as expected, then you can blame the line endings.
Note that this is *exactly* the problem that can also happen when
using any shared storage for working copies, such as a CIFS mounted
network directory or a USB drive, and hopping from Windows clients to
UNIX or Linux or MacOS clients. It's why manipulating EOL settings
should be avoided if possible: treat the files as the default "binary"
mode.
The commonest source of such adventures I've run into is using CygWin
and TortoiseSVN on the same working copy on the same client, followed
closely by using a shared working copy for group members from both NFS
and Samba clients.
>
>
> You mentioned converting using cvs2svn. I haven't used this tool for ages
> (since converting my private stuff at SVN 0.27 or so) so I'm not familiar with
> its use. However, you can probably tell it how to manage line endings. For
> most textual files (code, scripts, XML, HTML, texts), I would normally use
> "svn:eol-style=native", so that they are easily usable on any system.
>
>
> There are also "auto-props". These don't affect the converted sources but only
> new files. Since they are client-side settings, you have to configure each
> workplace separately. This is not necessary to look at right now, but good to
> keep in mind, since it makes it easier that new files have e.g. the right line
> endings. The real place to verify the endings is a hook on the server side,
> but that then takes away the informed user's ability to choose.
>
> Good luck!
>
> Uli
>
>
> --
> ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
> FAQ: http://subversion.apache.org/faq.html
> Docs: http://svnbook.red-bean.com/
>
> **************************************************************************************
> Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
> Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
> **************************************************************************************
> Visit our website at http://www.dominolaser.com
> **************************************************************************************
> Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
> E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
> **************************************************************************************
>
>
Received on 2011-08-31 13:54:09 CEST