git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alon Ziv <alonz@nolaviz.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: MinGW port: some questions
Date: Wed, 16 May 2007 22:55:34 +0300	[thread overview]
Message-ID: <1179345334.31213.48.camel@bruno.nolaviz.org> (raw)
In-Reply-To: <7vejlgegb9.fsf@assigned-by-dhcp.cox.net>

On Wed, 2007-05-16 at 12:09 -0700, Junio C Hamano wrote:
> I do not know if you mistyped dc380d6 (I do not find it there),

I did; it was dc3806d.  I don't know how it slipped...  I usually
cut'n'paste commit IDs :-/

> but reverting 4493e36 (merge of jc/3way) was intentional.  The
> work in that commit that deviates from the mainline is the
> jc/3way topic, which turned out to be incomplete and not very
> usable.

I know it was intentional; but the revert happened on Feb 13, and the
MinGW port is supposed to be merged up to v1.5.1.  The revert of dc3806d
("in_merge_bases(): optimization") and 40e0e66 ("merge_base(): move
traversal into a separate function.") also happened on Feb 13, and both
of there commits are still present in the MinGW master branch.

Maybe I'll just try cherry-picking the port's commits on top of the
latest master, and see if anything breaks :)

	-az

  reply	other threads:[~2007-05-16 19:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-16 18:52 MinGW port: some questions Alon Ziv
2007-05-16 19:09 ` Junio C Hamano
2007-05-16 19:55   ` Alon Ziv [this message]
2007-05-18  7:58   ` Johannes Sixt

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=1179345334.31213.48.camel@bruno.nolaviz.org \
    --to=alonz@nolaviz.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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;
as well as URLs for NNTP newsgroup(s).