Locking files tends to lead to problems in my expierience as people dont't unlock files in a timely manner (or at all) hindering workflow. Obviously there is a problem with unmergable files, but I don't see an easy solution.
I am not up to date with the progress of metadata in bzr, but presumably a plugin could be written to set/check a "lock flag" in metadata. Of course, locks would only be enforced if the plugin was loaded, but it would provide something to try out.
Locking files tends to lead to problems in my expierience as people dont't unlock files in a timely manner (or at all) hindering workflow. Obviously there is a problem with unmergable files, but I don't see an easy solution.
I am not up to date with the progress of metadata in bzr, but presumably a plugin could be written to set/check a "lock flag" in metadata. Of course, locks would only be enforced if the plugin was loaded, but it would provide something to try out.
In the mean time:
bzr mv document russel_ is_editing_ document
bzr ci
:-) or maybe not.