Bug 35378

Summary: [CVS UI] Timestamp not reset properly on commit
Product: [Eclipse Project] Platform Reporter: Michael Valenta <Michael.Valenta>
Component: TeamAssignee: Michael Valenta <Michael.Valenta>
Status: VERIFIED FIXED QA Contact:
Severity: minor    
Priority: P3 Keywords: readme
Version: 2.1   
Target Milestone: 2.1.1   
Hardware: PC   
OS: Windows XP   
Whiteboard:

Description Michael Valenta CLA 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.
Comment 1 Michael Valenta CLA 2003-04-14 15:58:35 EDT 
Shuld be an easy fix.
Comment 2 Michael Valenta CLA 2003-04-22 15:10:57 EDT 
Fix released to R2_1_maintenance branch
Comment 3 Jean-Michel Lemieux CLA 2003-06-02 11:41:19 EDT 
Verified.