35378: [CVS UI] Timestamp not reset properly on commit

2 files changed, 11 insertions, 2 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index e416b4d6f..13918e4fd 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -433,10 +433,10 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 			// The file contents matched the server contents so no entry line was sent
 			if (oldInfo == null) return;
 			Date timeStamp = oldInfo.getTimeStamp();
-			if (timeStamp == null) {
+			if (timeStamp == null || oldInfo.isMergedWithConflicts()) {
 				// If the entry line has no timestamp, put the file timestamp in the entry line
 				MutableResourceSyncInfo mutable = oldInfo.cloneMutable();
-				mutable.setTimeStamp(getTimeStamp());
+				mutable.setTimeStamp(getTimeStamp(), true /* clear merged */);
 				newInfo = mutable;
 			} else {
 				// reset the file timestamp to the one from the entry line
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
index e955a3b80..caf694892 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
@@ -88,6 +88,15 @@ public class MutableResourceSyncInfo extends ResourceSyncInfo {
 	}
 	
 	/**
+	 * Sets the timeStamp.
+	 * @param timeStamp The timeStamp to set
+	 */
+	public void setTimeStamp(Date timeStamp, boolean clearMerged) {
+		setTimeStamp(timeStamp);
+		if (clearMerged) setSyncType(TYPE_REGULAR);
+	}
+	
+	/**
 	 * Sets the keywordMode.
 	 * @param keywordMode The keywordMode to set
 	 */