Files changed when editing/committing between Windows and Linux
diptongo at gmail.com
Sat Apr 10 06:10:50 CDT 2010
> 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
> Those both work well. My problem is that every time I edit files on
> one system after previously editing it on the other, I end up with
> every file in the repository marked as changed even though they
> haven't. bitbucket tells me the reason for the update is "Binary file
> has changed or diff was empty.".
> Aside from all the clutter of Mercurial thinking the entire repository
> has changed, the files seem to work the same way.
This looks like a line ending issue. Or else, a text encoding problem.
> My question is, is there any way to prevent this situation I am
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).
I hope it helps.
"The noblest pleasure is the joy of understanding."
Leonardo da Vinci
More information about the Mercurial