Files changed when editing/committing between Windows and Linux

vern vwenberg at gmail.com
Sat Apr 10 08:35:29 UTC 2010


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.

My second system is what I take on the road. It is an Ubuntu 9.10
system and edit the PHP files using gEdit. I use this system only for
quick changes I need to make to the code. The files on this system are
local, but are pulled from bitbucket.

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.

My question is, is there any way to prevent this situation I am
describing?

Much thanks.



More information about the Mercurial mailing list