hg-git: push -d default seems not to work.

Uwe Brauer oub at mat.ucm.es
Fri May 5 10:10:18 UTC 2017


>>> "Rainer" == Rainer Woitok <rainer.woitok at gmail.com> writes:

Hi Rainer
   > Uwe,
   > On Wednesday, 2017-05-03 21:27:03 +0000, you wrote:

   >> ...
   >> Because they want clean 'clutter free' commits and they don't want
   >> branches to be pushed. I could use rebase with the collapse option,
   >> but then I will not really understand the graph in the future.

   > I already said it once,  Mercurial Queues  is exactly what you need: you
   > develop a patch  using as many changesets in your  local "patches/" sub-
   > repository as you need with all the try and error involved.  When you're
   > satisfied with the patch there are two choices:

Mercurial queues is  on my Todo list for sure. Till now I have been
frightened by comments like this

https://www.mercurial-scm.org/wiki/MqExtension
MQ is rarely needed for new Mercurial users. If you're used to it and
you like it, by all means, keep using it. But if you are learning
Mercurial, instead use modern tools, such as hg rebase, hg histedit, hg
graft, hg strip, hg strip --keep, and hg commit --amend. Check the
documentation for each of these commands.



   >    * Regardless of  how many changesets  you produced in your "patches/"
   >      sub-repository,  the patch itself is in a single "diff" format file
   >      in this sub-repository which you can directly send upstream.

   >    * Alternatively you can  "hg qfinish" your patch,  meaning it will be
   >      applied to your  local main repository  AS A SINGLE  NEW CHANGESET,
   >      giving you an opportunity  to provide a commit message containing a
   >      reasonable patch description.   This new changeset  can then easily
   >      be pushed.


What I am most interested is in the graph. That is I would like to have
a graph like this (after a merge from a named branch into (default/master)

@    changeset:   7058:b017880d8552
|\   tag:         tip
| |  parent:      7057:41a79851cd40
| |  parent:      7056:a740234025f0
| |  user:        Uwe Brauer <oub at mat.ucm.es>
| |  date:        Fri May 05 10:07:23 2017 +0000
| |  summary:     Add the select environment and related macros to exam style.
| |
| o  changeset:   7057:41a79851cd40
| |  bookmark:    master
| |  parent:      7055:d40e9bf06c53
| |  user:        Tassilo Horn <tsdh at gnu.org>
| |  date:        Sun Apr 23 08:42:45 2017 +0200
| |  summary:     Fix comment environment highlighting
| |
o |  changeset:   7056:a740234025f0
|/   branch:      exam
|    user:        Uwe Brauer <oub at mat.ucm.es>
|    date:        Sat Apr 22 20:44:41 2017 +0000
|    summary:     Add the select environment and related macros.
|
o  changeset:   7055:d40e9bf06c53
|  user:        Ikumi Keita <ikumi at ikumi.que.jp>
|  date:        Sat Apr 22 02:03:33 2017 +0900
|  summary:     Add test for my last commit

So I would like to push  changeset 7058:b017880d8552 without its
ancestors. It seems that the mq extension can do that, but how would the
corresponding graph look like? Most like the changesets on the named
branch would not be shown? or simply there would be no named branch but
the queue? How does a graph look in general if you use mq?

Thanks

Uwe 




More information about the Mercurial mailing list