merge topics (two heads)

[Uwe Brauer]

>>> "PD" == Pierre-Yves David <pierre-yves.david at ens-lyon.org> writes:

   > The two topics are linear, so there is effectively nothing to merge.
   > However it could make sense to allow that.

   > I wonder what's your motivation to do this merge.

Sometimes, for some repository my workflow is as follows.
I want to introduce a new feature, for this I usually would like to
create the named feature branch, commit and when I am satisfied to merge
into default. With a named branch everything works as expected. But to
create a new named branch for every feature might be a bit too much.
I don't want a bookmark, because I find the graph more difficult to read
than with a named branch or a topic.

Now it might happen, that nothing happened on the default branch. Most
people would prefer in this situation to do a fast forward. 

However, I prefer a «real» merge. Git in this situation (linear history
and two branches) allow you either a merge by fast forward or a merge
no-ff, which I find much more intuitive.

In short this is the reason I would like to have the possibility to
merge even in a linear history the «topic branch» back into the default
branch, without doing a fast forward.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5025 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20191101/e178b810/attachment.bin>