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

Re: Rename conflicts in the index

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 13, 2013, 18:05 UTC
Message-ID
<7va9q72n1u.fsf@alter.siamese.dyndns.org>
In-Reply-To
<A54CE3E330039942B33B670D971F857403995D93@TK5EX14MBXC252.redmond.corp.microsoft.com>
Edward Thomson <ethomson@microsoft.com> writes:
Show 9 quoted lines
> I would propose that we store the data about the file in conflict as it
> occurred through the renames.  For example, in a rename 1->2 conflict where
> A was renamed to both B and C, you would have a single conflict entry
> containing the data for A, B and C.  This would allow us to provide more
> detailed information to the user - and allow them to (say) choose a single
> name to proceed with.
>
> Is this something that has value to core git as well?  Alternately, is
> there something particularly stupid about this proposal?

I do not offhand see anything particularly stupid; a new optional index extension section CACHE_EXT_RENAME_CONFLICT might be a good addition.

Is "one side moves A to B while the other side moves it to C" the only case, or is it just an example? Off the top of my head, "one side moves A to x while the other side moves B to x/y" would also be something we would want to know. I am sure there are other cases that need to be considered.

I do not think we can discuss the design at the concrete level until the proposal spells out to cover all interesting cases in order for implementations to agree on the common semantics.

Previous: Edward ThomsonNext: Edward Thomson
Message 2 of 16 in “Rename conflicts in the index”
  1. Edward ThomsonMar 13, 2013
  2. Junio C HamanoMar 13, 2013
  3. Edward ThomsonMar 13, 2013
  4. Edward ThomsonMar 26, 2013
  5. Junio C HamanoMar 26, 2013
  6. Edward ThomsonMar 26, 2013
  7. Edward ThomsonMar 27, 2013
  8. Junio C HamanoMar 27, 2013
  9. Edward ThomsonMar 27, 2013
  10. Junio C HamanoMar 27, 2013
  11. Edward ThomsonApr 1, 2013
  12. Edward ThomsonApr 2, 2013
  13. Junio C HamanoApr 2, 2013
  14. Edward ThomsonApr 2, 2013
  15. Junio C HamanoApr 3, 2013
  16. Junio C HamanoApr 3, 2013

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.