From: Miklos Vajna <vmiklos@frugalware.org>
To: Elijah Newren <newren@gmail.com>
Cc: Alex Riesen <raa.lkml@gmail.com>,
git@vger.kernel.org, Johannes.Schindelin@gmx.de,
gitster@pobox.com, spearce@spearce.org
Subject: Re: [PATCH 4/5] merge_recursive: Fix renames across paths below D/F conflicts
Date: Wed, 30 Jun 2010 00:33:19 +0200 [thread overview]
Message-ID: <20100629223319.GC31048@genesis.frugalware.org> (raw)
In-Reply-To: <AANLkTilggM9-vBabNvJiYMiQZyZtJMLhfWleYKvuJNMv@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
On Tue, Jun 29, 2010 at 09:55:38AM -0600, Elijah Newren <newren@gmail.com> wrote:
> Well, as far as this particular if-block is concerned, blame suggests
> that you and Miklos were responsible (I apologize if gmail screws up
> and inserts line wrapping)::
>
> $ git blame -C -C -L 1020,1038 merge-recursive.c
> 9047ebbc (Miklos Vajna 2008-08-12 18:45:14 +0200 1020)
> if (mfi.clean &&
> 9047ebbc (Miklos Vajna 2008-08-12 18:45:14 +0200 1021)
> sha_eq(mfi.sha, ren1->pair->two->sha1) &&
And if you have a look at what commit 9047ebbc does, that's really just
about changing it to be part of libgit, so I could call it without
fork() from builtin-merge.
To sum up, I sadly have to say I don't know too much about the
merge-recursive internal sematics.
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-06-29 22:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-29 1:12 [PATCH 0/5] D/F conflict fixes newren
2010-06-29 1:12 ` [PATCH 1/5] Add additional testcases for D/F conflicts newren
2010-06-29 1:12 ` [PATCH 2/5] Add another rename + D/F conflict testcase newren
2010-06-29 8:49 ` Alexander Gladysh
2010-06-29 1:12 ` [PATCH 3/5] merge-recursive: Fix D/F conflicts newren
2010-06-29 1:12 ` [PATCH 4/5] merge_recursive: Fix renames across paths below " newren
2010-06-29 7:54 ` Miklos Vajna
2010-06-29 12:52 ` Elijah Newren
2010-06-29 13:36 ` Alex Riesen
2010-06-29 15:55 ` Elijah Newren
2010-06-29 22:33 ` Miklos Vajna [this message]
2010-06-30 6:53 ` Alex Riesen
2010-06-29 1:12 ` [PATCH 5/5] fast-import: Handle directories changing into symlinks newren
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=20100629223319.GC31048@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=raa.lkml@gmail.com \
--cc=spearce@spearce.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;
as well as URLs for NNTP newsgroup(s).