From: "Eric S. Raymond" <esr@thyrsus.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Requirements for integrating a new git subcommand
Date: Sun, 25 Nov 2012 23:49:22 -0500 [thread overview]
Message-ID: <20121126044922.GA14505@thyrsus.com> (raw)
In-Reply-To: <7vmwy5xe9n.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com>:
> "Eric S. Raymond" <esr@thyrsus.com> writes:
>
> > While the weave operation can build a commit graph with any structure
> > desired, an important restriction of the inverse (unraveling)
> > operation is that it operates on *master branches only*. The unravel
> > operation discards non-master-branch content, emitting a warning
> > to standard error when it has to do so.
>
> Imagine that I have a simple four-commit diamond:
>
> I---A
> \ \
> B---M
>
> where Amy and Bob forked the initial commit made by Ian and created
> one commit each, and their branches were merged into one 'master'
> branch by a merge commit made by Mac. How many state snapshots will
> I see when I ask you to unravel this? Three, or four?
You will see four tree states. I have managed to remove the
master-branch-only restriction.
> As to the procedural stuff, I think others have sufficiently
> answered already. If I may add something, a new stuff typically
> start its life in contrib/ before it proves to be useful.
Thank you, I have submitted a documentation patch which folds
in the on-list discussion.
As a separate point...are you requesting that I submit my integration
patch to drop git-weave in contrib? If so, I will of course comply.
But I will point out that git-weave is not a half-thought out
experiment; it is fully documented and has a functional test. The
case for its usefulness is bolstered by one previous contrib script,
which the author has agreed to retire in favor of git-weave.
--
<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
prev parent reply other threads:[~2012-11-26 4:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 5:30 Requirements for integrating a new git subcommand Eric S. Raymond
2012-11-22 19:17 ` Shawn Pearce
2012-11-22 22:11 ` Eric S. Raymond
2012-11-23 9:13 ` Michael J Gruber
2012-11-23 15:53 ` Eric S. Raymond
2012-11-23 20:21 ` Christian Couder
2012-11-23 16:29 ` Eric S. Raymond
2012-11-23 9:27 ` Peter Krefting
2012-11-23 15:35 ` Eric S. Raymond
2012-11-26 11:01 ` Peter Krefting
2012-11-26 2:57 ` Junio C Hamano
2012-11-26 4:49 ` Eric S. Raymond [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121126044922.GA14505@thyrsus.com \
--to=esr@thyrsus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.