Bug? "hg fetch" updates before merge

[Bryan O'Sullivan]

On Wed, Feb 18, 2009 at 10:22 AM, Ted Pavlic <ted at tedpavlic.com> wrote:

> Why does "hg fetch" do an update even though a merge is coming?
>

It updates to the new head, so that after the merge, your local changes are
on the right. This assumes that whatever you've pulled is the canonical head
that you want to merge your changes into, which is usually true. You can
always use --switch-parent if that's not the case for you, or set that to be
the default behaviour.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090218/944f47d9/attachment.htm