Re: Two bugs with renaming

On Wednesday 19 March 2008 7:51:45 pm Junio C Hamano wrote:

John Goerzen [off-list ref] writes:

quoted

# Now here comes bug #1...

Please try 1.5.5-rc0 or newer.  I think Linus's unpack_trees() updates,
even though it was sort of a rocky road to get there, addresses this.

Namely, v1.5.5-rc0~25 was the commit that fixed this issue.

Correct, bug #1 is gone with current git master.

quoted

# Set up bug #2

This hasn't been addressed, I think.

Also correct.  Bug #2 is still present with current git master.  It shows:

jgoerzen@katherina:/tmp/testrepo$ git merge master
error: Entry 'files.upstream/delete.me' would be overwritten by merge. Cannot 
merge.
fatal: merging of trees 5cec043802758b3a4cd617905c395a9f12bf89a2 and 
9671b5181cb0649f39cfae372af1aed56a24010d failed
Merge with strategy recursive failed.

Is there any other information I can provide to assist with tracking that one 
down?

-- John