merge vs. "update -m" and working with a remote repository

[Christian Boos]

Ramon Diaz-Uriarte wrote:
> Dear All,
>
> I'm a newby to hg and I have two questions that affect mainly how I
> work with a remote repository.
>
> 1. After going through the tutorials, chcking the function help, and
> searching on the wiki and email lists, I am still not clear about the
> differences between "update -m" and "merge".  In fact, the

There are no differences, "hg merge" is simply an alias for
"hg update -m", and "hg merge" is more self-explaining
and more intuitive to some people...

> TutorialMerge and TutorialConflict do not use "hg merge" but only "hg
> update -m". 

This is because the "hg merge" alias is a recent addition.
This is something that we should address. Incidentally I modified
the QuickStart wiki page to use "hg merge" instead of "hg update -m",
and planned to continue to do this with the Tutorial.

> And the text for the help of update and merge is
> essentially identical regarding the merging operation. Thus, it seems

Maybe it would be useful to redirect to the "hg merge" help,
from the update -m help option.

-- Christian


-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_update_m_doc.diff
Type: text/x-patch
Size: 681 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20060514/cda28503/fix_update_m_doc.bin