Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-06-06 16:29:25 -0400
committerjames2002-06-06 16:29:25 -0400
commit07f43e1e1be1f46e81d89956bf53fe410e2f4898 (patch)
tree0f13c5df2d13df308ab8e66406e9a2c503290322
parent50695cfc854d5f9712aa2fe715cf32b001e68630 (diff)
downloadeclipse.platform.team-07f43e1e1be1f46e81d89956bf53fe410e2f4898.tar.gz
eclipse.platform.team-07f43e1e1be1f46e81d89956bf53fe410e2f4898.tar.xz
eclipse.platform.team-07f43e1e1be1f46e81d89956bf53fe410e2f4898.zip
18638: "No" to "Add" prompt in sync view, shouldn't prompt for commit comment if nothing to commit
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java3
1 files changed, 3 insertions, 0 deletions
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 87171513e..49ed1bcac 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
@@ -102,6 +102,9 @@ public class ForceCommitSyncAction extends MergeAction {
case 1: // no
cvsSyncSet.removeNonAddedChanges();
changed = syncSet.getChangedNodes();
+ if (changed.length == 0) {
+ return syncSet;
+ }
break;
case 2: // cancel
return null;

Back to the top