git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] git-p4: Add copy detection support

From
PWPete Wyckoff <pw@padd.com>
Date
Feb 12, 2011, 13:32 UTC
Message-ID
<20110212133223.GA12432@arf.padd.com>
In-Reply-To
<AANLkTinF=9ELNMV0TmBzjEPa=7BZF+dnAK7VUrUw4QNK@mail.gmail.com>
vitor.hda@gmail.com wrote on Sat, 12 Feb 2011 00:29 +0000:
Show 8 quoted lines
> 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
Previous: Vitor AntunesNext: Pete Wyckoff
Message 8 of 10 in “git-p4: Improve rename detection support.”
  1. 1/2 git-p4: Improve rename detection support.Vitor Antunes, Jan 30, 2011
  2. 2/2 git-p4: Add copy detection supportVitor Antunes, Jan 30, 2011
  3. Pete WyckoffFeb 6, 2011
  4. Vitor AntunesFeb 6, 2011
  5. Pete WyckoffFeb 6, 2011
  6. Vitor AntunesFeb 7, 2011
  7. Vitor AntunesFeb 12, 2011
  8. Pete WyckoffFeb 12, 2011
  9. Pete WyckoffFeb 6, 2011
  10. Vitor AntunesFeb 6, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.