Re: merge a branch which contains a name-changed file

[Larry Jones]

Susie writes:
> 
> On a specifie branch, I change a file's name from "old" to "new" (the
> file content is also changed). Next I am going to merge the branch into
> the HEAD.
> 
> I hope to see the file "old" is replaced with "new"  in the HEAD after
> the merge. Can I see it?  ( I guess the case is: both files exist, and I
> have to remove the file "old" from HEAD)

Assuming you did the rename by removing the old name and adding the new
name and then committing those changes, the merge should try to remove
the old name and add the new name.  (But removing the old name will fail
if there were changes on the trunk after the branchpoint which you will
have to merge into the new file manually.)

-Larry Jones

I'm a genius. -- Calvin