Re: Gitk feature - show nearby tags

From: Paul Mackerras <paulus@samba.org>
Date: Jun 3, 2006, 12:23 UTC
Message-ID: <17537.32585.260926.48759@cargo.ozlabs.ibm.com>
In-Reply-To: <7vslmm8rcd.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano writes:

Show 5 quoted lines

> Another thing that would equally be useful is to show which
> branch a particular commit is on, so for example I can pick one
> commit while doing "gitk next" to view the next branch and see
> which topic it belongs to, and "gitk this-topic" to see which
> commits on that topic, if any, are not yet in the "next" branch.

That wouldn't be hard to do, it's just a matter of finding which heads are descendents of the selected commit. I think that with heads, you would want to see all the descendent heads, rather than just the nearest ones (those that aren't descendents of another descendent head) as I do with tags. What do you think? If one head is a descendent of another, and both are descendents of the selected commit, should I show both?

> BTW, what's the maintenance/rewind policy on the "new" branch of
> gitk.git?  If you are never going to rewind it, I could pull it
> in "next" (and keep pulling your "master" in my "master") for
> wider exposure if you like.

I intend to pull "new" into "master" shortly, assuming I don't get any bug reports for the "new" branch. :)

If you pull my "new" into your "next", and you then pull your "next" into your "master", and I pull my "new" into my "master", and you pull my "master" into your "master", won't we end up with duplicate merges?

Paul.