Re: git bug: moved file with local unstaged changes are lost during merge

On Thu, Apr 12, 2012 at 10:13:04AM -0600, Joe Angell wrote:

Is this the right place to post bug reports?

It is. Thanks for including a concise test case with your bug report.

Unfortunately, the merge-recursive code is a mess, and has several known
buggy corner cases with renames. Elijah (cc'd) spent a lot of time
trying to sort these out a while ago, but there still some known
failures. t6042 and t6036 detect some of them. But I thought we managed
to clean up all of the overwriting bugs.

Original bug report is below.

-Peff

On Wed, Apr 11, 2012 at 12:20 PM, Joe Angell [off-list ref] wrote:

quoted

What steps will reproduce the problem?
git init
echo "initial checkin" >> readme
git add readme
git commit -m "inital checkin"
git branch b1
git checkout b1
echo "b1" >> readme
git add readme
git commit -m "b1 readme"
git checkout master
git mv readme readme_master
git ci -m "moved readme"
echo "master" >> readme_master
git merge b1

What is the expected output? What do you see instead?
I expect to have git prevent the merge due to local changes to the
file.  Instead it overwrites the file (erasing the local modification
"master") and you end up with:
cat readme_master
initial readme
b1

What version of the product are you using? On what operating system?
Reproduced on 1.7.9.6 and from the git-core repo 1.7.10.128.g7945c.
This is on ubuntu 10.04.

Please provide any additional information below.

This problem only seems to occur after you check in the move, then
make local modifications, then do the merge.

--
---------------
Joe Angell
cell: (720) 260-2190