From: Linus Torvalds <torvalds@osdl.org>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Petr Baudis <pasky@ucw.cz>, git@vger.kernel.org
Subject: Re: [1/5] Parsing code in revision.h
Date: Sun, 17 Apr 2005 13:06:18 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0504171254500.7211@ppc970.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0504171253030.7211@ppc970.osdl.org>
On Sun, 17 Apr 2005, Linus Torvalds wrote:
>
> Yes. I'm not opposed to yours, I was just opposed to some of the things
> around it you did, so I wrote mine as a kind of place-holder. I'll happily
> take patches to turn it from a rally simple and stupid one into a more
> polished version.
Btw, before I forget - I did have another reason. I actually think that
the date is potentially a lot more important than "how many parents deep".
In particular, it's entirely possible that the top of my head might be a
veru recent merge that merges with a small fix relative to a very old
parent (making that old parent be just two hops away from the head), while
the thing I want to merge might also have that old parent (for similar
reasons) as a relatively "close" parent from a pure link-counting
standpoint.
The reason I bring this up is that quite often people end up basing their
work on a specific release version, so a merge (especially in specialized
areas) may thus bring such an old parent pretty close to the head, and it
can actually be quite possible (indeed probable) that such a parent ends
up being a common parent.
However, it can easily be a very _bad_ parent.
In ascii barfic:
----------------------- patch ---------
/ \
/ \
- old release -- ... lots of development .. -----HEAD
\ \
\ \
\ ---------------------patch-- MERGE-HEAD
\ /
.. lots of development .. /
it looks like "old release" is pretty close to both HEAD and MERGE-HEAD,
right?
But that's just an artifact of the fact that they both had a trivial merge
against some older code, and if the two "lots of development" things have
ever done an earlier merge, there's quite possibly a _much_ better common
parent there somewhere.
I dunno.
Linus
next prev parent reply other threads:[~2005-04-17 20:51 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050417144947.GG1487@pasky.ji.cz>
2005-04-17 15:20 ` [0/5] Patch set for various things Daniel Barkalow
2005-04-17 15:24 ` [1/5] Parsing code in revision.h Daniel Barkalow
2005-04-17 16:09 ` Petr Baudis
2005-04-17 16:44 ` Daniel Barkalow
2005-04-17 18:18 ` [1/5] " Linus Torvalds
2005-04-17 18:30 ` Petr Baudis
2005-04-17 19:25 ` Linus Torvalds
2005-04-17 19:45 ` Daniel Barkalow
2005-04-17 19:54 ` Linus Torvalds
2005-04-17 20:06 ` Linus Torvalds [this message]
2005-04-17 20:22 ` Daniel Barkalow
2005-04-17 19:09 ` Daniel Barkalow
2005-04-17 15:27 ` [2/5] Add merge-base Daniel Barkalow
2005-04-17 16:01 ` Petr Baudis
2005-04-17 16:36 ` Daniel Barkalow
2005-04-17 16:51 ` [2.1/5] " Daniel Barkalow
2005-04-17 21:21 ` Petr Baudis
2005-04-17 21:25 ` Daniel Barkalow
2005-04-17 15:31 ` [3/5] Add http-pull Daniel Barkalow
2005-04-17 18:10 ` Petr Baudis
2005-04-17 18:49 ` Daniel Barkalow
2005-04-17 19:08 ` Petr Baudis
2005-04-17 19:24 ` Daniel Barkalow
2005-04-17 19:59 ` Petr Baudis
2005-04-21 3:27 ` Brad Roberts
2005-04-21 4:28 ` Daniel Barkalow
2005-04-21 22:05 ` tony.luck
2005-04-22 19:46 ` Daniel Barkalow
2005-04-22 22:40 ` Petr Baudis
2005-04-22 23:00 ` Daniel Barkalow
2005-04-22 23:08 ` Petr Baudis
2005-04-22 23:12 ` Daniel Barkalow
2005-04-22 23:24 ` Martin Schlemmer
2005-04-17 18:58 ` [3.1/5] " Daniel Barkalow
2005-04-17 15:35 ` [4/5] Add option for hardlinkable cache of extracted blobs Daniel Barkalow
2005-04-17 17:47 ` Petr Baudis
2005-04-17 18:54 ` Daniel Barkalow
2005-04-17 19:25 ` Paul Jackson
2005-04-17 19:59 ` Petr Baudis
2005-04-17 20:03 ` Daniel Barkalow
2005-04-17 20:18 ` Petr Baudis
2005-04-18 1:35 ` Paul Jackson
2005-04-18 1:48 ` Petr Baudis
2005-04-18 4:49 ` Paul Jackson
2005-04-17 20:58 ` Russell King
2005-04-17 22:10 ` First ever real kernel git merge! Linus Torvalds
2005-04-18 1:24 ` [4/5] Add option for hardlinkable cache of extracted blobs Paul Jackson
2005-04-18 1:20 ` Paul Jackson
2005-04-17 15:37 ` [5/5] Add commit-id to version Daniel Barkalow
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=Pine.LNX.4.58.0504171254500.7211@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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).