two-way sync, without branches

[Patrick Mézard]

Yakov Lerner a écrit :
> OK, thanks to Hollis Blanchard on IRC who figured
> the push/pull sequence that does not create any new heads.
> I want to show it on the list in case anybody sees problems with this:
> 
>         hg diff >/tmp/temp.diff
>         hg revert -a
>         hg pull -u -v;
>         patch -p1 < /tmp/temp.diff
>         hg commit -A -m changes;
>         hg push
> 
> Are there any hidden problems in it ?
> I am not sure the diff/patch will handle removed files and dirs.

What if the diff no longer applies ?
diff/patch might also lose executable bit, binary files, renames... 
Maybe you can use gpatch on your system and generate --git diffs.

Give a try to MQ too 
(http://www.selenic.com/mercurial/wiki/index.cgi/MqExtension)

--
Patrick Mézard