elmentary (watson): merge (named) branches and/or bookmarks
Uwe Brauer
oub at mat.ucm.es
Sat Dec 17 09:56:26 UTC 2016
Hi
Sorry for such an elementary question again, but bookmarks drive my
crazy.
I usually prefer named branches and the following works as expected:
hg init
echo feature > new.el
hg add new.el
hg commit -m feature1
echo offical2 >> new.el
hg commit -m feature2
echo feature3 >> new.el
hg commit -m feature3
hg branch exam
echo exam > exam.el
hg add exam.el
hg commit -m exam
echo exam2 >> exam.el
hg commit -m exam2
hg update default
hg merge exam
Now for some repos I have to use the hg-git plugin (since these repos are
using git) so I have to use bookmarks instead of named branches. So I
thought the equivalent to the above would be
hg init
hg bookmark master
echo feature > new.el
hg add new.el
hg commit -m feature1
echo offical2 >> new.el
hg commit -m feature2
echo feature3 >> new.el
hg commit -m feature3
hg bookmark exam
echo exam > exam.el
hg add exam.el
hg commit -m exam
echo exam2 >> exam.el
hg commit -m exam2
hg update master
hg merge exam
But I obtain
abort: nothing to merge
(use 'hg update' or check 'hg heads')
Sigh what is the problem here?
Uwe Brauer
More information about the Mercurial
mailing list