hg-git plugin, fast forward a git repo.

[Malcolm Matalka]

Uwe Brauer <oub at mat.ucm.es> writes:

> Hi 
>
> The following drives me crazy. I have cloned a git repository whose
> graph looks like.
>
>
>
> @  changeset:   195:b2396f3ceca3
> |  bookmark:    strings
> |  tag:         default/strings
> |  tag:         tip
> |  user:        User1
> |  date:        Sun Oct 06 21:41:11 2019 -0400
> |  summary:     Fix spurious character inseted.
> |
> o  changeset:   194:cd6feaf07f93
> |  user:        User1
> |  date:        Sun Oct 06 21:40:06 2019 -0400
> |  summary:     In matlab-mode, setup `forward-sexp-function' so any random tools using it (like blink-paren-mode) will
> |
> o  changeset:   193:70f9f872fa09
> |  user:        User1
> |  date:        Thu Oct 03 21:15:41 2019 -0400
> |  summary:     metest.el - add metest-indents-test and support functions.
> |
> .
> .
> .
> o  changeset:   170:6c03da83e522
> |  bookmark:    master
> |  tag:         default/master
> |  user:        Uwe Brauer <oub at mat.ucm.es>
> |  date:        Fri Sep 28 17:26:26 2018 +0200
> |  summary:     Add support for Strings in matlab mode (thanks to Eric Ludlam)
> |
>
> So in git speech I have 2 branches, the master (default) branch HASH 6c03 and 
>
> And the string branch  HASH b2396f3ceca3. 
>
> The history in the repository is  linear.
>
> Now I want to merge  the strings branch into the master branch.
>
> So I thought of just moving the master bookmark to tip, if I do that
> than there is nothing to push. So I deleted the strings bookmark on tip,
> but again nothing to push. The tags default/master and default/strings
> confuse me, but I cannot delete them.

Why didn't you just merge strings into master?

Or fast-forward by:

hg up strings
hg book master

?

>
> I am stuck. [1]
>
>
> Uwe Brauer
> Footnotes:
> [1]  (I rather disklike git)
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial