Git development
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-base
Date: Wed, 13 Apr 2005 20:49:51 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.58.0504132040020.7211@ppc970.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.21.0504131447480.30848-100000@iabervon.org>



On Wed, 13 Apr 2005, Daniel Barkalow wrote:
>
> I wrote a pretty dumb program that will find some common ancestor for a
> pair of commits. It finds the one which is closest to one of the commits
> by number of generations. This is, at least, not strictly worse than any
> other common ancestor, at least (like picking the original release would
> be).
> 
> It wouldn't be too hard to do this much with rev-tree, but should be
> easier to extend.

I agree. But I did the silly "common revision tracking" part slightly
differently and in particular I already made fsck and rev-tree use the 
same exact code.

Also, I don't see why you did the "common parent" thing as part of the
"library", since that really does seem to be a very specific to this 
problem, and neither fsck nor rev-tree really wants it. 

Also, the date parsing really is a separate issue from the revision 
tracking (fsck does not want date parsing, but rev-tool does), so I think 
you might want to do for date parsing what I just did for the revision.h 
thing? No point in tying them together.

So could I ask you to re-factor it and base it on my current tree? Make 
the "merge-base" program have that common parent thing in it, and factor 
out the common date parsing into "parse-date.c" or something?

		Linus

       reply	other threads:[~2005-04-14  3:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <Pine.LNX.4.21.0504131447480.30848-100000@iabervon.org>
2005-04-14  3:49 ` Linus Torvalds [this message]
2005-04-14 17:17   ` [PATCH] merge-base Daniel Barkalow
2005-04-14 17:20     ` [PATCH] merge-base-rebased 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

* 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.0504132040020.7211@ppc970.osdl.org \
    --to=torvalds@osdl.org \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox