From: Sam Vilain <sam@vilain.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: n-heads and patch dependency chains
Date: Wed, 05 Apr 2006 19:31:10 +1200 [thread overview]
Message-ID: <4433723E.1080705@vilain.net> (raw)
In-Reply-To: <e0vqjk$5dr$1@sea.gmane.org>
Jakub Narebski wrote:
>First, hydras or n-head was invented to avoid capping and recapping, and
>just advance it as a normal head (and to remember what are
>subprojects/patch dependency chains/whatever to choose).
>
>Second, we could generalize those extra commit references in commit
>structure (be they "bind", "prior" or "previous", or "depends-on") and have
>
>
Note that these are all quite different types of references. "Bind"
implies an unmerged tree to be woven in on checkout, "prior and
"previous" a historical relationship, and "depends-on" the previous
commit that the change that this commit supplies was based on.
So, I think "parent" already means "depends-on" closely enough.
>commit/merge pluggable helper manage them. And merge strategy may make use
>of them.
>
>Third, would using *directory* with for a N-HEAD (containing all the
>subheads, subprojects, chains, branches, fibers, whatever) instead of an
>ordinary file for HEAD be a good idea? For hydra if we want it to be easily
>interweaved with ordinary commit I think we would also need the link for
>bottom, hydra shoulder, hydra tail i.e. common commit being starting point
>for all the chains, or subprojects (for subprojects it can be empty tree
>commit).
>
>
This was similar to the original suggestion, of heads that have multiple
heads, or hydra. I think the basic rejection for this is that nothing is
then tracking the progression of the merged tree - unless you keep a
"cherry picked" tree for the combined work. And of course it is a
backwards incompatible change.
Sam.
next prev parent reply other threads:[~2006-04-05 7:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-03 7:48 n-heads and patch dependency chains Sam Vilain
2006-04-03 14:29 ` Linus Torvalds
2006-04-03 15:38 ` Sam Vilain
2006-04-03 19:37 ` Junio C Hamano
2006-04-03 23:55 ` Sam Vilain
2006-04-04 9:28 ` Andreas Ericsson
2006-04-04 9:51 ` Junio C Hamano
2006-04-04 10:44 ` Andreas Ericsson
2006-04-04 11:03 ` Jakub Narebski
2006-04-04 11:47 ` Andreas Ericsson
2006-04-20 18:08 ` Jon Loeliger
2006-04-20 18:55 ` Junio C Hamano
2006-04-21 8:50 ` Andreas Ericsson
2006-04-04 19:00 ` Junio C Hamano
2006-04-04 20:18 ` Jakub Narebski
2006-04-05 6:34 ` Sam Vilain
2006-04-05 7:11 ` Jakub Narebski
2006-04-05 7:31 ` Sam Vilain [this message]
2006-04-05 7:59 ` Jakub Narebski
2006-04-04 0:51 ` Jakub Narebski
2006-04-04 11:05 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2006-04-03 22:13 linux
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4433723E.1080705@vilain.net \
--to=sam@vilain.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).