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

Re: Files not deleted when merging after a rename

From
Alex Riesen <raa.lkml@gmail.com>
Date
Jan 21, 2008, 21:20 UTC
Message-ID
<20080121212015.GB5263@steel.home>
In-Reply-To
<d997e2110801211145o5fe0a1bbpb1e32dd71b70568e@mail.gmail.com>
Mark Desnoyer, Mon, Jan 21, 2008 20:45:07 +0100:
Show 18 quoted lines
> Hi,
> 
> I've run across a small problem and I was wondering if I could get
> some help. I have two users A and B. They are both git-cloned from a
> common repository on a different server.
> 
> User A moves a directory:
> foo/bar/ ==> bar
> using:
> git mv foo/bar bar
> git commit
> git push
> 
> Meanwhile, user B is doing some other changes that are completely
> unrelated and has a few local commits. Now, when user B pulls from the
> repository (git pull), and returns no errors merging, the directory
> "bar" is created, but "foo/bar" is not deleted, although, it becomes
> untracked.

Directories are never tracked. It should have been deleted though. Did it have (or still has) some untracked files in it?

Previous: Mark DesnoyerNext: Mark Desnoyer
Message 2 of 8 in “Files not deleted when merging after a rename”
  1. Mark DesnoyerJan 21, 2008
  2. Alex RiesenJan 21, 2008
  3. Mark DesnoyerJan 21, 2008
  4. Alex RiesenJan 22, 2008
  5. Mark DesnoyerJan 23, 2008
  6. Alex RiesenJan 24, 2008
  7. Dmitry PotapovJan 23, 2008
  8. Alex RiesenJan 24, 2008

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.