hg-git plugin and bookmarks (master)

[Scott Palmer]

> On Oct 29, 2016, at 5:31 AM, Uwe Brauer <oub at mat.ucm.es> wrote:
> 
> Hi
> 
> Several days ago I asked that question in the hg-git mailing list,
> without success. So maybe someone who uses that plugin on the mercurial
> list faced the problem and could give me a hint.
> So here is the question
> 
> 
> I have configured (via a bridge connection) to push and pull from the git repo
> git://git.code.sf.net/p/matlab-emacs/src
> which I partially maintain.
> 
> Now recently somebody using git directly added some code in a git branch called
> proposed_changes
> 
> however when I pull using hg-git
> 
> I obtain
> hg log -G
> 
>  changeset:   167:ea809ae422ac
> |  bookmark:    master
> |  bookmark:    proposed_changes
> |  tag:         tip
> |  user:        John Ciolfi <>
> |  date:        Tue Oct 18 10:18:15 2016 -0400
> |  summary:     Added custom completions, fixed typos
> |
> o  changeset:   166:0d6ad456b544
> |  user:        John Ciolfi <>
> |  date:        Mon Oct 10 20:43:17 2016 -0400
> |  summary:     matlab-load.el is a generated file
> |
> o  changeset:   165:96cee86a0430
> |  user:        John Ciolfi <>
> |  date:        Mon Oct 10 20:39:21 2016 -0400
> |  summary:     Fixed TAB completion, debugging updates, warning fixes
> |
> o  changeset:   164:dfd746317b38
> |  user:        Uwe Brauer <>
> |  date:        Fri Sep 02 11:59:06 2016 +0000
> |  summary:     * tlc.el: Add space to
> 
> 
> while it should be
> 
>  changeset:   167:ea809ae422ac
> |  bookmark:    proposed_changes
> |  tag:         tip
> |  user:        John Ciolfi <>
> |  date:        Tue Oct 18 10:18:15 2016 -0400
> |  summary:     Added custom completions, fixed typos
> |
> o  changeset:   166:0d6ad456b544
> |  user:        John Ciolfi <>
> |  date:        Mon Oct 10 20:43:17 2016 -0400
> |  summary:     matlab-load.el is a generated file
> |
> o  changeset:   165:96cee86a0430
> |  user:        John Ciolfi <>
> |  date:        Mon Oct 10 20:39:21 2016 -0400
> |  summary:     Fixed TAB completion, debugging updates, warning fixes
> |
> o  changeset:   164:dfd746317b38
> |  bookmark:    master
> |  user:        Uwe Brauer <>
> |  date:        Fri Sep 02 11:59:06 2016 +0000
> |  summary:     * tlc.el: Add space to
> 
> why does the plugin put the master bookmark where it does not belong to?

Did you have the master bookmark activated before you pulled? Did you pull with the -u option? Did you do an update after pulling?
In other words, did *you* move the master bookmark locally?


Scott