File Locking

[Jorge Vargas]

On Tue, Oct 7, 2008 at 7:30 PM, Michael Smith
<michael.smith at thalesatm.com> wrote:
> Matt Mackall wrote:
>
>> It's possible, but you'd be better off dragging the cavemen in your
>> office into the 20th century first. When they get comfortable with that,
>> you can try joining us in the 21st.
>
> If anything, file locking is coming back due to the use of binary UML
> model files for code generation. Merging of models is next to impossible
> so locking is preferred.

I may be missing something but can't you just invoke a merge command
that will open both conflicting files in your UML program and save the
results as the "merged version". if your UML tool has command line
arguments writting a little tools that will invoke it and then safe
the output will be trivial.