two-way sync, without branches

[Dustin Sallings]

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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20070717/516158da/attachment.htm