Comment 2 for bug 109730

Revision history for this message
John A Meinel (jameinel) wrote : Re: Bazaar has no lock command

I think you are mistaken in how the workflow works with Bazaar.

We don't support modifying individual files separately. You modify the whole tree at a time. So it isn't possible to lock "just a couple files".

Further, when working in "centralized" mode with a checkout, you cannot commit without updating (as we do lock the remote repository while doing the local commit).

So if someone modifies a file that you are working on, and manages to commit before you do, when you update you will get a conflicted file (though it will probably just dump 2 copies into the working tree if it realizes that they aren't text files).

We do have the functionality to lock a remote branch (and leave it in a locked state). And it wouldn't be too hard to update the code base so if it knows it already has the remote lock it re-uses it.

But *I* would consider it bad form to allow users to leave remote branches locked.

I would actually recommend that "independent concurrent updates" will happen no matter what you do. (If someone has a checkout, they can always convert it to an independent branch and just do a local commit).

I do see that having a way to say "I'm working on this, you probably want to wait until I'm done" could be useful. I'm not sure that it belongs in the VCS.