problems with the hg-git plugin and bookmarks

[Kevin Bullock]

> On Sep 6, 2016, at 10:11, Uwe Brauer <oub at mat.ucm.es> wrote:
> 
>>>> "Uwe" == Uwe Brauer <oub at mat.ucm.es> writes:
> 
>> 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
> 
> I stripped both changesets and pulled again now I obtain
> 
> pulling from git://git.savannah.gnu.org/auctex.git
> no changes found
> abort: unknown revision '63859b8097d34576e918d544c1cac0ba869efe69'!
> 
> So I think I can forget that repo?! And must clone it again?

When you are preparing a patch to submit upstream, you don't generally want to merge it into master yourself. But your log tells me that you didn't actually merge it, because your final commit has one parent.

The two heads in your repo reflect exactly what would've happened if you were using git locally: your 'master' is in a different place than upstream's 'master', so both are marked. To resolve this, you'll have to either rebase your changes onto default/master, or merge default/master into your branch. Again, since you're just submitting a patch, you don't generally want to introduce any merges, so rebase is the preferred choice.

Unfortunately hg-git has some rough edges around history editing, but you should be able to get unstuck by running `hg git-cleanup`.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock