two-way sync, without branches

[Bela Babik]

+1 alternative:
http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks#head-5b2e4d05ef883f9b5724f8f1e6d56487545159d3

-- 
teki

On 7/17/07, Dustin Sallings <dustin at spy.net> wrote:
>
>
> On Jul 16, 2007, at 17:12, Yakov Lerner wrote:
> 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.
>
>  It looks like you've reinvented mq, but why is this necessary?  Do you
> really have multiple changes happening in the same project from different
> locations at the same time?  If so, is merging a big deal?
>
> --
> Dustin Sallings
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>