Re: first parent, commit graph layout, and pull merge direction

From: Andreas Krey <a.krey@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: first parent, commit graph layout, and pull merge direction
Date: Thu, 23 May 2013 11:06:57 +0200	[thread overview]
Message-ID: <20130523090657.GB23933@inner.h.apk.li> (raw)
In-Reply-To: <7v4ndukhx0.fsf@alter.siamese.dyndns.org>

On Wed, 22 May 2013 11:07:07 +0000, Junio C Hamano wrote:
...
> If you have a four-commit segment in your commit ancestry graph

I never had yet. :-(

> (time flows from left to right; turn your head 90-degrees to the
> right if you want a gitk representation):
> 
>     ---A--X
>         \/
>         /\
>     ---B--Y
> 
> where X and Y are both merges between A and B, having A as their
> first parent, how would you express such a graph with first-parent
> chain going a straight line?

Of course there are multiple possible straight lines and how it looks
depends on the order I use the existing heads to fish them out. (That
is, when the straight lines join, I need to bend one of them.) Assuming
I take the one where X is on, I expect a look like

-----A-------X-----
      \      |
       +- Y--------
          |  |
-----B----+--+

Branch heads that are reachable from other head are picked after those
that aren't reachable.

The point is to get the feature branches being displayed on separate
lanes (and thus visibly sticking out) and not being intermingled with
the longer-living branches.

...
> Don't do that, then.

:-) Problem is, in this case 'I' expands to about
    1<<7 people I need to educate on this.

Andreas

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800