Question

I’m finding that a number of my changes are being ‘lost’ when our contractor performs a check-in.

The general process is as follows:

1. I perform some bug analysis and implement a fix.
2. I then check-in my code.
3. The contractor performs a check-out/check-in at a later date.
4. The changes from the previous changeset (my changes) are lost.

In my view, this is pretty unacceptable, particularly when I’m dealing with application-breaking regressions introduced since the last build.

This has happened at least twice now, and the only thing I can think of is that the contractor is failing to ensure that he has the latest changeset at check-out. Our repo does not allow multiple check-out, and forces get latest on checkout, which makes things so weird (seeing as we both should be working with Server workspaces).

Could there be any other cause of this problem? I don’t want to take my concerns to my line manager without being sure I’ve covered all bases.

Answer 1

Get Latest item on check out is set in the client and not in the repo, which means that your contractor may still be able to checkout the wrong version. They should get merge conflicts upon doing so, but that depends on where they edit (and how they manage such conflicts).