Files not deleted when merging after a rename

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <git@...>
Date: Monday, January 21, 2008 - 3:45 pm

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.

Any ideas why the merge isn't deleting foo/bar? The users are using
git version 1.5.2.5 in Ubuntu Hoary. Thanks in advance.

-Mark
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Files not deleted when merging after a rename, Mark Desnoyer, (Mon Jan 21, 3:45 pm)
Re: Files not deleted when merging after a rename, Alex Riesen, (Mon Jan 21, 5:20 pm)
Re: Files not deleted when merging after a rename, Mark Desnoyer, (Mon Jan 21, 5:45 pm)
Re: Files not deleted when merging after a rename, Alex Riesen, (Tue Jan 22, 3:28 am)
Re: Files not deleted when merging after a rename, Dmitry Potapov, (Wed Jan 23, 4:19 am)
Re: Files not deleted when merging after a rename, Alex Riesen, (Thu Jan 24, 3:56 am)
Re: Files not deleted when merging after a rename, Mark Desnoyer, (Tue Jan 22, 10:08 pm)
Re: Files not deleted when merging after a rename, Alex Riesen, (Thu Jan 24, 3:52 am)