problems with the hg-git plugin and bookmarks
Uwe Brauer
oub at mat.ucm.es
Tue Sep 6 12:34:34 UTC 2016
Hi
I apologize if that question is to hg-git specific and should be better
asked on that list, but maybe I have not fully understood the concepts
of bookmarks.
I want to use (contribute) to auctex, which is using git.
So I first cloned that repo using the hg-git plugin
hg clone git://git.savannah.gnu.org/auctex.git
Since I don't have write access, I don't want to pull but just send
patches to the auctex list.
Anyhow after cloning I have the repo which contains three bookmarks
gendocspatch 6288:6d1b307d15ea
* master 6843:24c9ce964599
simplify-TeX-parse-error 6696:1ea19cbde4cc
Master being active.
So I want to provide some new code. I create a new bookmark, say
hg bookmark exam
I add a new file code and commit. All new stuff corresponds now to the
new bookmark exam.
Then I want to merge that into the master bookmark.
So
hg update master
hg merge
hg commit "Merged finish"
I generate a patch for inspection. Then I want to add a new file, but
now I decide to pull again.
hg pull
The problem is meanwhile a new commitment was appended but a strange
one according to hg log -G
o changeset: 6844:63859b8097d3
| tag: default/master
| tag: tip
| parent: 6841:299c7ffa7c22
| user: Mosè Giordano <mose at gnu.org>
| date: Sun Sep 04 18:22:29 2016 +0200
| summary: Do not use a function from cl
|
| @ changeset: 6843:24c9ce964599
|/ bookmark: master
| parent: 6841:299c7ffa7c22
| user: Uwe Brauer <oub at mat.ucm.es>
| date: Sun Sep 04 10:33:45 2016 +0000
| summary: Merge exam into master
So changeset 6844 (which is new): does not carry a bookmark but the tag default/master
While my merged one still has the bookmark master. I am completely puzzled.
What should I do?
Thanks
Uwe Brauer
More information about the Mercurial
mailing list