How do you handle files that cannot support concurrent changes in Mercurial?

Question

I am using Mercurial with TortoiseHg. Each developer has their own repositories, and there is one central repository on the server to synchronize our changes. (This will sound weak, but we use it to control the source code for the old VB6 project. We can do nothing about it ...)

As mentioned elsewhere, in VB6 there is a big problem with combining .frx files (form resources). Thus, the code changes seem to merge well, but if the two developers simultaneously make changes to the presentation of the form, we cannot merge.

I'm fine with the prohibition of concurrent changes, but, of course, the whole point of Mercurial is that it is distributed, so there is no way to force the file to be locked before editing. I don’t believe in this Mercurial solution, so I wonder: other developers who use Mercurial for version control, do you have a third-party tool that helps to block files for editing when it is necessary? We made a mistake using Mercurial instead of something like SVN?

Answer 1

I heard that some people use a stand-alone gateway server ( this one , in particular).

Answer 2

' Mercurial:

, . , Subversion , - .