Re: locked files

[Gary Heuston]

this way seems like second guessing your programmers too much.  By the
same
token someone could accidentally write a bug into a program even while
normally
changing it, but can you really account for it using the tool?  Probably
not...code reviews should be set up to prevent bad code from getting out
onto
the production system, and any bugs whether from merging incorrectly or
from
simple programming mistakes should be caught there.  Does that make
sense to
anyone? =)

Gary
address@hidden

>
> Locking model:  There are several possibilities.  I've seen them.
> 1.  Somebody makes the quick fix, by getting the program lock.
> Person doing the larger development keeps interim copy of program,
> and checks it back in without the quick fix.
> 2.  Somebody makes the quick fix, and the person doing the larger
> development hand-merges it in incorrectly, creating a new bug.
> 3.  Somebody makes the quick fix, and the person doing the larger
> development recreates the changes on top of the newly fixed version,
> inaccurately.
> 4.  Quick fix is made and hand-merged in without program assistance.