problems with the hg-git plugin and bookmarks

[Kevin Bullock]

> On Sep 6, 2016, at 14:25, Uwe Brauer <oub at mat.ucm.es> wrote:
> 
> Here is my strategy:
> 
> 
>    -  I create in auctex-bridge a new bookmark, say exam, add files
>       stuff and commit. Then what? So far I have merged my changes in
>       the master branch (gitspeak) which maybe is not wise since I
>       cannot push. But once I had them merged I created a patch and
>       sent it for inspection.
> 
>    -  But then the problem is: meanwhile (my patch is still pending)
>       other stuff has been pushed into the repo. 
> 
>    -  So it seems wise to pull, and I then what?
> 
>    -  I merge? But then my local rep is not in sync with the rep. So I
>       strip and then pull?

Until your patch lands upstream, the wisest course is to leave your work in an open branch. If you're just submitting it as a patch, you can pull from upstream and rebase your work on top of that (since you haven't pushed your commits to any other public repository).

Merges into mainline (default, master, trunk) are generally the responsibility of the project maintainer. You shouldn't be doing them as a contributor, since it will overcomplicate your local usage exactly as you describe.

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