Files changed when editing/committing between Windows and Linux

[Sune Foldager]

On 10-04-2010 13:10, Isaac Jurado wrote:
> Replying vern:
>>
>> Greetings!
>>
>> First, allow me to explain my setup. On my main desktop, I use Windows
>> 7 and edit my PHP files using Netbeans 6.8. The files I'm editing are
>> on a Linux system mounted via Samba. I push this repository to
>> bitbucket. Everything works well.
> 
> Filesystems such as SMB or NFS carry many problems: locking issues,
> performance degradation and so on.  I advice you to use Mercurial as it
> is: a Distributed VCS.  You can have clones wherever you want and
> synchronize directly between them, without having to resort to
> bitbucket.

Using bitbucket is fine, I think, but I am also pretty convinced that
the problems experienced have to do with the SMB share. Instead, have a
clone directly on the local machine.

>> My question is, is there any way to prevent this situation I am
>> describing?
> 
> If it's a line-ending issue, you have two options:
> 
>     1. Use the Win32TextExtension (never used it myself and I'm not sure
>        if it really works).
>     2. Configure all your editors (in all systems) to use a single line
>        ending convention (CRLF or LF).

At least just make sure you use a sane editor (so on Windows that's NOT
notepad), which can handle both kinds of line endings, and that should
be enough, really. I do Mercurial work on a Windows machine, and all the
files are in LF there. I never used any conversion extension.

/Sune