Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-18 15:38:25 +0000
committerMichael Valenta2002-04-18 15:38:25 +0000
commit2a6b27bde23b037c1171421afe5eadb76b50d3b4 (patch)
treece882b3cc9100f6793b00ec5327a6b1dc1ba987f
parent05444c61000bffff43ea882daf5f878d3cb78ddf (diff)
downloadeclipse.platform.team-2a6b27bde23b037c1171421afe5eadb76b50d3b4.tar.gz
eclipse.platform.team-2a6b27bde23b037c1171421afe5eadb76b50d3b4.tar.xz
eclipse.platform.team-2a6b27bde23b037c1171421afe5eadb76b50d3b4.zip
13997: Team - "Override and commit" does not work if never took the server changeI20020418
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java4
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
index b9515dcda..0638083af 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSRemoteSyncElement.java
@@ -163,8 +163,9 @@ public class CVSRemoteSyncElement extends RemoteSyncElement {
if (remote == null) {
info.setAdded();
} else {
- // Otherwise change the revision to the remote revision
+ // Otherwise change the revision to the remote revision and dirty the file
info.setRevision(remote.getSyncInfo().getRevision());
+ info.setTimeStamp(null);
}
} else {
// We have an incoming add, turn it around as an outgoing delete
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
index b41f90942..732ac13a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java
@@ -156,6 +156,10 @@ public class ForceCommitSyncAction extends MergeAction {
while (it.hasNext()) {
ITeamNode node = (ITeamNode)it.next();
collectIncomingDeletions(node, incomingDeletions, monitor);
+ if ((node instanceof TeamFile) && !additions.contains(node)) {
+ CVSRemoteSyncElement element = (CVSRemoteSyncElement)((TeamFile)node).getMergeResource().getSyncElement();
+ element.makeOutgoing(monitor);
+ }
}
it = incomingDeletions.iterator();
while (it.hasNext()) {

Back to the top