Bug? "hg fetch" updates before merge

[Ted Pavlic]

On 2/18/09 3:10 PM, Bryan O'Sullivan wrote:
> On Wed, Feb 18, 2009 at 10:22 AM, Ted Pavlic <ted at tedpavlic.com
> <mailto: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.

Thanks -- that did the trick.

There's something that just seems inefficient about doing an update 
before a merge though. In my case, where I have a small "template" 
repository on which larger repositories are based, adding 
--switch-parent makes the fetch **MUCH** faster (and it doesn't touch 
things it shouldn't!).

Thanks, again --
Ted

-- 
Ted Pavlic <ted at tedpavlic.com>

   Please visit my ALS association page:
         http://web.alsa.org/goto/tedpavlic
   My family appreciates your support in the fight to defeat ALS.