Description Michael Valenta 2003-03-20 11:44:49 EST

There is a scenario in which the timestamp is not reset properly after a 
commit. Here it is:

1) A file has a change that conflict with a change already committed to the 
server.
2) Perform an update. The sync info contains "Result of Merge+timstamp" which 
indicates that the file needs to be edited before it can be committed.
3) Edit the file so the contents match that on the server
4) Commit

The timestamp of the file is reset but the timestamp in the entry line is not. 
It needs to be.