merge topics (two heads)

[Malcolm Matalka]

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

> Hi 
>
> Please look at the following script
>
> 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 topics NewTopic
> echo "Fifth" >> test.org
> hg commit  -m "Fifth"
> echo "Six" >> test.org
> hg commit  -m "Six"
> hg log -G
> hg heads
>
> changeset:   5:ab935cede9ba
> tag:         tip
> topic:       NewTopic
> user:        Uwe Brauer <oub at mat.ucm.es>
> date:        Fri Oct 25 20:54:22 2019 +0200
> summary:     Six
>
> changeset:   3:c5dc6239ac03
> user:        Uwe Brauer <oub at mat.ucm.es>
> date:        Fri Oct 25 20:54:21 2019 +0200
> summary:     Fourth
>
> So they are two heads, but I receive
>  hg up -r
>  hg merge NewTopic

What are you trying to do here?  What do you expect to happen?

>
>
> abort: nothing to merge
>
>
> So I am puzzled.
>
> Uwe Brauer 
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 487 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20191025/5016d51d/attachment.asc>