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

Re: [PATCH 4/5] merge_recursive: Fix renames across paths below D/F conflicts

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jun 29, 2010, 07:54 UTC
Message-ID
<20100629075442.GB31048@genesis.frugalware.org>
In-Reply-To
<1277773936-12412-5-git-send-email-newren@gmail.com>
On Mon, Jun 28, 2010 at 07:12:15PM -0600, newren@gmail.com wrote:
Show 13 quoted lines
> From: Elijah Newren <newren@gmail.com>
> 
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> I'm a little uneasy with this change, mainly because I don't fully
> understand the rename processing logic (I was actually kind of surprised
> when I made these changes and it worked).  Although I verified that
> these changes (and my others in this patch series) introduce no new
> breakages in the testsuite and even fix a known issue, I'm still not
> quite sure I follow the logic well enough to feel fully confident in
> this change.  I'm particularly worried I may have neglected some closely
> related cases that I should have fixed but which may still be broken.

Same here, I touched merge-recursive, but not this part of it, so others will give you a better review, I'm sure. :)

Other than that, I like it, thanks!
Previous: newren@gmail.comNext: Elijah Newren
Message 7 of 13 in “D/F conflict fixes”
  1. 0/5 D/F conflict fixesnewren@gmail.com, Jun 29, 2010
  2. 1/5 Add additional testcases for D/F conflictsnewren@gmail.com, Jun 29, 2010
  3. 2/5 Add another rename + D/F conflict testcasenewren@gmail.com, Jun 29, 2010
  4. Alexander GladyshJun 29, 2010
  5. 3/5 merge-recursive: Fix D/F conflictsnewren@gmail.com, Jun 29, 2010
  6. 4/5 merge_recursive: Fix renames across paths below D/F conflictsnewren@gmail.com, Jun 29, 2010
  7. Miklos VajnaJun 29, 2010
  8. Elijah NewrenJun 29, 2010
  9. Alex RiesenJun 29, 2010
  10. Elijah NewrenJun 29, 2010
  11. Miklos VajnaJun 29, 2010
  12. Alex RiesenJun 30, 2010
  13. 5/5 fast-import: Handle directories changing into symlinksnewren@gmail.com, Jun 29, 2010

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.