merge topics (two heads)

[Malcolm Matalka]

Uwe Brauer <oub at mat.ucm.es> writes:

>    > Uwe Brauer <oub at mat.ucm.es> writes:
>
>
>    > What are you trying to do here?  What do you expect to happen?
>
>
> I wanted to see whether topics behave like named branches and I thought
> so, because creating a topic creates a new head, however I cannot merge
> them.
>
> The following script  where I replaced topics by branch, displays the
> same graph (almost) and also indicates two heads, these two heads
> however I can merge.

I'm not sure how topics work, but for bookmarks, you cannot merge one
bookmark into another if it's just a fast forward.  So perhaps topics
have the same semantics.

>
> hg init
> echo "First" > test.org
> hg add test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "First"
> echo "Second" >> test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "Second"
> echo "Third" >> test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "Third"
> echo "Forth" >> test.org
> hg commit  -m "Fourth"
> hg branch NewTopic
> echo "Fifth" >> test.org
> hg commit  -m "Fifth"
> echo "Six" >> test.org
> hg commit  -m "Six"
> hg log -G
> hg heads
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial