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

Re: git mv messed up file mapping if folders contain identical files

From
BOBill Okara <billokara@gmail.com>
Date
Feb 24, 2016, 23:51 UTC
Message-ID
<CADsr5c8akqt7tsgptuDqCyt2JW8ie9js5eFt7oxXxDxtGMLJFA@mail.gmail.com>
In-Reply-To
<xmqqwpptr83a.fsf@gitster.mtv.corp.google.com>
it actually does matter in the following scenario:
1) master branch has identical content.txt files in the folder structure
2) do the git mv in a new branch
3) master branch updated the context.txt to contain new data (more
relevant to the containing folder)
4) new branch need to merge the updates from master

after the merge, demo/content.txt in the new path would contain updates from dev/content.txt from master...

On Wed, Feb 24, 2016 at 4:39 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 7 quoted lines
> Bill Okara <billokara@gmail.com> writes:
>
>> just want to see if this is a bug, user error (on my end), or??
>
> Not a bug, not a user error, just "it does not matter", I think.
>
>
Previous: Junio C HamanoNext: Bill Okara
Message 3 of 9 in “git mv messed up file mapping if folders contain identical files”
  1. Bill OkaraFeb 24, 2016
  2. Junio C HamanoFeb 24, 2016
  3. Bill OkaraFeb 24, 2016
  4. Bill OkaraFeb 25, 2016
  5. Kevin DaudtFeb 25, 2016
  6. Stefan BellerFeb 25, 2016
  7. Bill OkaraFeb 25, 2016
  8. SZEDER GáborFeb 26, 2016
  9. Bill OkaraFeb 26, 2016

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.