Changing the file name in Mercurial on Windows

Question

I am using the latest version of Mercurial with TortoiseHg on Windows. Let's say I have 5 branches in my repository, everyone has a file with a name MyFile.txt. I want to change only the case of this file name in the branch so that the new name is MyFile.txt. Later, when I merge this branch into my other 4 branches, the same file needs to be renamed from MyFile.txtto MyFile.txtwithout random collisions. Therefore, in the end, all branches will be synchronized with the new file name MyFile.txt.

What is the best way to achieve this on Windows?

Edit: For example, do I need to rename MyFile.txtto something else first, for example bla.txt, and then rename bla.txtto MyFile.txt, and if so, should I do the same on all 5 branches to avoid accidental collisions during merging?

Answer 1

For more information on answers, see Mercury Faced Collision Resolution on Windows .

I managed to solve my problem by renaming the file to something else, for example temp.txt, and then making a change, and then renaming back to the original file name with a case change. Merging with other branches worked fine.