From: Pete Wyckoff <pw@padd.com>
To: Vitor Antunes <vitor.hda@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] git-p4: Add copy detection support
Date: Sat, 12 Feb 2011 08:32:23 -0500 [thread overview]
Message-ID: <20110212133223.GA12432@arf.padd.com> (raw)
In-Reply-To: <AANLkTinF=9ELNMV0TmBzjEPa=7BZF+dnAK7VUrUw4QNK@mail.gmail.com>
vitor.hda@gmail.com wrote on Sat, 12 Feb 2011 00:29 +0000:
> Originally the code always opened the files for editing just in case
> there was a patch to be applied late,r. This makes sense, because git
> can detect a rename (or copy) even if the files differ. But doing this
> would create an "unclean" integration in the revision graph. So, what
> I thought was "if we have available the SHA of the origin and
> destination files in diff-tree output why not compare them before
> opening the file for editing?" And that was the only purpose for this
> comparison.
I get what you are saying and it makes sense to fix this. I
think you are on the right track, and I can't see the problem
in the code.
Side note: p4 installations can make client SubmitOptions
have "revertunchanged" to avoid these annoying null integrations.
-- Pete
next prev parent reply other threads:[~2011-02-12 13:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-30 23:19 [PATCH 1/2] git-p4: Improve rename detection support Vitor Antunes
2011-01-30 23:19 ` [PATCH 2/2] git-p4: Add copy " Vitor Antunes
2011-02-06 0:25 ` Pete Wyckoff
2011-02-06 17:25 ` Vitor Antunes
2011-02-06 22:05 ` Pete Wyckoff
2011-02-07 11:11 ` Vitor Antunes
2011-02-12 0:29 ` Vitor Antunes
2011-02-12 13:32 ` Pete Wyckoff [this message]
2011-02-06 0:21 ` [PATCH 1/2] git-p4: Improve rename " Pete Wyckoff
2011-02-06 12:39 ` Vitor Antunes
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=20110212133223.GA12432@arf.padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=vitor.hda@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.