"Push creates new remote heads" and my humble workflow (kind of dummy question)

[Manuel Jacob]

On 2020-07-16 04:09, Victor Sudakov wrote:
> Uwe Brauer wrote:
>> 
>> 
>> > The worst is that I cannot catch what actions cause this situation.
>> > Perhaps my forgetting to do "pull -u" before commit, or maybe not.
>> 
>> You could give
>> 
>> 
>> hg fetch
>> 
>> 
>> a try.
> 
> This still does not help me understand what is really happening behind 
> the
> scenes: why the same changeset is duplicated in the repository. In 
> other
> words, why do I have to merge what's already there.

What do you mean by "duplicated"?

Before the merge, you had two heads. To get one head, you can merge 
them.

132 and 134 will have the same diff (if there was no merge conflict). 
But that doesn’t mean that they are identical. It’s just a result of how 
Mercurial shows the diff of merges (it shows the difference between the 
first parent the merge).