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

Re: [PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases

From
Elijah Newren <newren@gmail.com>
Date
Sep 8, 2010, 06:41 UTC
Message-ID
<AANLkTin0KidU3og7SVEVUAaRfMzafEvvme_vP-0V773E@mail.gmail.com>
In-Reply-To
<1283928041-9882-1-git-send-email-newren@gmail.com>
On Wed, Sep 8, 2010 at 12:40 AM, Elijah Newren <newren@gmail.com> wrote:
Show 7 quoted lines
> This fixes an issue reported by Nick (no lastname given) on the
> mailing list, as well as a closely related issue in the handling of
> rename + directory/file conflicts, namely where a filename on one side
> of the rename is a directory name on the other side of the merge.
>
> Change since v1:
>  * Split unrelated 2/3 patch out into a separate submission

...oh, and now the series is based on master instead of next. (I would base it on maint, but since I was adding another testcase to t3509 and t3509 does not yet exist in maint, I couldn't as easily put it there.)

Previous: Junio C Hamano
Message 5 of 5 in “[PATCHv2 0/2] Fix resolvable rename + D/F conflict testcases”
  1. Elijah NewrenSep 8, 2010
  2. 1/2 t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren, Sep 8, 2010
  3. 2/2 merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren, Sep 8, 2010
  4. Junio C HamanoSep 10, 2010
  5. Elijah NewrenSep 8, 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.