Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-02-14 11:25:15 -0500
committerMichael Valenta2002-02-14 11:25:15 -0500
commit8c333face7346d7d007259ccaab45c979a5b6932 (patch)
tree4d4dfd59ceabd51b9122c1dbbdf787dc703b6b06
parentfbd2dbb58a598a58778a029967ab0a81a313470a (diff)
downloadeclipse.platform.team-8c333face7346d7d007259ccaab45c979a5b6932.tar.gz
eclipse.platform.team-8c333face7346d7d007259ccaab45c979a5b6932.tar.xz
eclipse.platform.team-8c333face7346d7d007259ccaab45c979a5b6932.zip
9748: Incoming additions from another branch have wrong timestamp
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
index b916108ca..2d5094cea 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
@@ -81,7 +81,9 @@ public class ResourceSyncInfo {
}
// override the timestamp that may of been in entryLine. In some cases the timestamp is not in the
// entry line (e.g. receiving entry lines from the server versus reading them from the Entry file).
- if(timestamp!=null) {
+ if (isAdded()) {
+ this.timeStamp = DUMMY_TIMESTAMP;
+ } else if(timestamp!=null) {
this.timeStamp = timestamp;
}
}

Back to the top