문제

I'm using the latest version of Mercurial with TortoiseHg on Windows. Let's say I have 5 branches in my repository that all have a file named MyFile.txt. I want to change just the case of this filename in a branch so the new name is myfile.txt. Later on when I merge this branch into my other 4 branches, that same file needs to be renamed from MyFile.txt to myfile.txt with no case-folding collisions. So eventually all branches will be in sync with the new filename myfile.txt.

What's the best way to achieve this on Windows?

Edit: For example, should I first rename MyFile.txt to something different like bla.txt and then rename bla.txt to myfile.txt, and if that's the case, should I do the same thing on all 5 branches to avoid case-folding collisions when merging?

도움이 되었습니까?

해결책

See Resolving Mercurial Case-Folding Collision in Windows for more detailed answers.

I was able to solve my problem by renaming the file to something different such as temp.txt and then committing the change, and then renaming back to the original file name with the case change. Merging into other branches worked fine.

라이센스 : CC-BY-SA ~와 함께 속성
제휴하지 않습니다 StackOverflow
scroll top