Pull behaviour using branches with bookmarks

[Martin Geisler]

"Alexander Schatten" <ml_alexanderschatten at gmx.at> writes:

> Sorry, if I am annoying, I just wonder: no one has an idea about my
> issue? Or did I explain it unclear or, alternatively, is the question
> so stupid, that no one bothers to answer... ;-)

Nah, I think it was a little unclear what the error was and perhaps
nobody has seen it before.

> -------- Original-Nachricht --------
>> Datum: Tue, 25 Jan 2011 14:11:42 +0100
>> Von: "Alexander Schatten" <ml_alexanderschatten at gmx.at>
>> An: mercurial at selenic.com
>> Betreff: Pull behaviour using branches with bookmarks
>
>> Hi,
>> 
>> 
>> I am a little bit confused: I tried to use bookmarks for local
>> feature branches. Now, from time to time I want to pull the last
>> changes from the main repo.
>> 
>> Now my question: I have the impression that pull behaves differently
>> depending in which branch I am in: if I do an "hg update main" before
>> the pull the result is different to "hg update feature" before the
>> pull. This is very confusing to me. The first result is obviously the
>> desired one, the latter seems to mess up the branches and the
>> bookmarks.

Can you tell us what the difference is? Show a short and self-contained
example of what you mean.

I'm not using bookmarks myself, so I'm surprised that 'hg pull' should
behave differently.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/en/services/mercurial/blog/