From 07f43e1e1be1f46e81d89956bf53fe410e2f4898 Mon Sep 17 00:00:00 2001
From: james
Date: Thu, 6 Jun 2002 20:29:25 +0000
Subject: 18638: "No" to "Add" prompt in sync view, shouldn't prompt for commit
 comment if nothing to commit

---
 .../org/eclipse/team/internal/ccvs/ui/sync/ForceCommitSyncAction.java  | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
cgit v1.2.3