I'm searching for an auto-sync solution based in Mercurial (HG) to use for binary and text files.

I tried other synchronism softwares, but I did not like them because they do not offer a good solution when there are some file conflicts to merge or when users move or rename folders.

Since I have not a file server in my network I'll use one common computer to "host" the files and then other three to clone its repository and to be synchronized with it. All computers use Windows XP, but in future we can use some computers with Ubuntu or other OSs.

I need a auto-sync software because I wouldn't like to people worry about HG operations (pull, push, commit...). If possible software would solve conflicts automatically too.

I choose HG because if it's necessary to perform some manual operation, it is easy to understand by normal users. But if you know some a better VCS solution, please suggest.

link|improve this question

57% accept rate
feedback

Know someone who can answer? Share a link to this question via email, Google+, Twitter, or Facebook.

Your Answer

 
or
required, but never shown

Browse other questions tagged or ask your own question.