Thorsten Schöning wrote:
Guten Tag Dave Tingling,
am Mittwoch, 11. Mai 2011 um 17:50 schrieben Sie:
1) - Developer A: adds, edits and commits a file X,
2) - Developer A: later, again edits and commits file X,
3) - Developer A: still later, again edits and commits file X,
4) - Developer N: who has never before seen file X, runs an update. She
gets a weird version of file X which contains only *some* lines of the
set of changes made by Developer A in each of the edit/commit sessions
(1), (2), and (3).
And this behaviour is reproducible, meaning that every time the file x
is deleted from the local working copy of dev N on each and every
update the newly created file is freaky? Is it freaky on clean
checkouts, too?
We cannot replicate the problem on demand, but it recurs with
(seemingly) random files at random times. The worst thing is that when
an update silently "reverts" some unknown file (to a "frankenstein"
version), it is subsequently committed as a new version by the
unsuspecting developer.
How do you know that the update is the problem? If the file in the
repository looks fine, I don't think the problem comes with the
update, but afterwards, on any build actions or stuff like that. As
you say: The freaky file is committed by dev N and that is the
problem, between update and commit it is somehow changed. The update
process just make changes to the local file, if already present, that
are on the server and it's pretty likely that this will work as
expected.
The interesting part is between update and commit of dev N and in your
case i would look at the diffs to maybe get an idea of the tool or
process or whatever is responsible for the changes in the file. Maybe
there's something common in every changes?
Mit freundlichen Grüßen,
Thorsten Schöning
Thanks for the quick reply and your guidance Thorsten. I'm not 100%
sure. I'll work with the developers to clarify, and then will report back.
Thank you,
-Dave
