Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-08 10:56:01 -0400
committerMichael Valenta2002-04-08 10:56:01 -0400
commitc05a94e02aee7bf8f0edefbeab4d689c919b515f (patch)
tree70d3b6757635bfea97a45ffcf82041a71de9606f
parent27eae61ca02ec30c070f0c1e78b65c27d816a452 (diff)
downloadeclipse.platform.team-c05a94e02aee7bf8f0edefbeab4d689c919b515f.tar.gz
eclipse.platform.team-c05a94e02aee7bf8f0edefbeab4d689c919b515f.tar.xz
eclipse.platform.team-c05a94e02aee7bf8f0edefbeab4d689c919b515f.zip
10456: Replace with Tag no progress and should use checkout
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java17
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java117
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties4
6 files changed, 99 insertions, 63 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index 88a743057..058c6b3ee 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -65,6 +65,7 @@ public class CVSProviderPlugin extends Plugin {
private boolean promptOnFileDelete = true;
private boolean promptOnFolderDelete = true;
private boolean showTasksOnAddAndDelete = false;
+ private boolean replaceUnmanaged = true;
private String cvsRshCommand = DEFAULT_CVS_RSH;
private String cvsServer = DEFAULT_CVS_SERVER;
private IConsoleListener consoleListener;
@@ -382,5 +383,21 @@ public class CVSProviderPlugin extends Plugin {
public void setShowTasksOnAddAndDelete(boolean showTasksOnAddAndDelete) {
this.showTasksOnAddAndDelete = showTasksOnAddAndDelete;
}
+ /**
+ * Gets the replaceUnmanaged.
+ * @return Returns a boolean
+ */
+ public boolean isReplaceUnmanaged() {
+ return replaceUnmanaged;
+ }
+
+ /**
+ * Sets the replaceUnmanaged.
+ * @param replaceUnmanaged The replaceUnmanaged to set
+ */
+ public void setReplaceUnmanaged(boolean replaceUnmanaged) {
+ this.replaceUnmanaged = replaceUnmanaged;
+ }
+
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index 1d1358457..e6eab601a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ccvs.core.util;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.team.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.ccvs.core.ICVSFile;
import org.eclipse.team.ccvs.core.ICVSFolder;
import org.eclipse.team.ccvs.core.ICVSResourceVisitor;
@@ -40,9 +41,13 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
public void visitFile(ICVSFile file) throws CVSException {
ResourceSyncInfo info = file.getSyncInfo();
if (info == null) {
+ // Delete unmanaged files if the user wants them deleted
+ if (CVSProviderPlugin.getPlugin().isReplaceUnmanaged()) {
+ file.delete();
+ }
// If the file is unmanaged, just leave it as is
} else if (info.isAdded()) {
- // For added files, delete and unmanage
+ file.delete();
file.unmanage(null);
} else if (info.isDeleted()) {
// If deleted, null the sync info so the file will be refetched
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
index fada1f8c5..ad306f228 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPreferencesPage.java
@@ -57,6 +57,7 @@ public class CVSPreferencesPage
private Button promptOnFileDelete;
private Button promptOnFolderDelete;
private Button showMarkers;
+ private Button replaceUnmanaged;
/**
* Utility method that creates a combo box
@@ -154,6 +155,9 @@ public class CVSPreferencesPage
showMarkers = createCheckBox(composite, Policy.bind("CVSPreferencePage.showAddRemoveMarkers")); //$NON-NLS-1$
showMarkers.setToolTipText(Policy.bind("CVSPreferencePage.showAddRemoveMarkersTooltip")); //$NON-NLS-1$
+ replaceUnmanaged = createCheckBox(composite, Policy.bind("CVSPreferencePage.replaceUnmanaged")); //$NON-NLS-1$
+ replaceUnmanaged.setToolTipText(Policy.bind("CVSPreferencePage.replaceUnmanagedTooltip")); //$NON-NLS-1$
+
initializeValues();
quietnessCombo.addSelectionListener(new SelectionListener() {
@@ -214,6 +218,7 @@ public class CVSPreferencesPage
promptOnFileDelete.setSelection(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
promptOnFolderDelete.setSelection(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
showMarkers.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
+ replaceUnmanaged.setSelection(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
}
/**
@@ -242,6 +247,7 @@ public class CVSPreferencesPage
store.setValue(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE, promptOnFileDelete.getSelection());
store.setValue(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE, promptOnFolderDelete.getSelection());
store.setValue(ICVSUIConstants.PREF_SHOW_MARKERS, showMarkers.getSelection());
+ store.setValue(ICVSUIConstants.PREF_REPLACE_UNMANAGED, replaceUnmanaged.getSelection());
CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(
store.getBoolean(ICVSUIConstants.PREF_PRUNE_EMPTY_DIRECTORIES));
@@ -255,6 +261,8 @@ public class CVSPreferencesPage
store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
CVSProviderPlugin.getPlugin().setShowTasksOnAddAndDelete(
store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
+ CVSProviderPlugin.getPlugin().setReplaceUnmanaged(
+ store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
return true;
}
@@ -274,6 +282,7 @@ public class CVSPreferencesPage
promptOnFileDelete.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
promptOnFolderDelete.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
showMarkers.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
+ replaceUnmanaged.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 173091006..2b4a20d80 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -46,8 +46,8 @@ public class CVSUIPlugin extends AbstractUIPlugin {
/**
* The id of the CVS plug-in
*/
- public static final String ID = "org.eclipse.team.cvs.ui";
- public static final String DECORATOR_ID = "org.eclipse.team.cvs.ui.decorator";
+ public static final String ID = "org.eclipse.team.cvs.ui"; //$NON-NLS-1$
+ public static final String DECORATOR_ID = "org.eclipse.team.cvs.ui.decorator"; //$NON-NLS-1$
private Hashtable imageDescriptors = new Hashtable(20);
@@ -178,6 +178,7 @@ public class CVSUIPlugin extends AbstractUIPlugin {
store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE, true);
store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE, true);
store.setDefault(ICVSUIConstants.PREF_SHOW_MARKERS, true);
+ store.setDefault(ICVSUIConstants.PREF_REPLACE_UNMANAGED, true);
store.setDefault(ICVSUIConstants.PREF_CVS_RSH, CVSProviderPlugin.DEFAULT_CVS_RSH);
store.setDefault(ICVSUIConstants.PREF_CVS_SERVER, CVSProviderPlugin.DEFAULT_CVS_SERVER);
@@ -210,6 +211,7 @@ public class CVSUIPlugin extends AbstractUIPlugin {
CVSProviderPlugin.getPlugin().setPromptOnFileDelete(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FILE_DELETE));
CVSProviderPlugin.getPlugin().setPromptOnFolderDelete(store.getBoolean(ICVSUIConstants.PREF_PROMPT_ON_FOLDER_DELETE));
CVSProviderPlugin.getPlugin().setShowTasksOnAddAndDelete(store.getBoolean(ICVSUIConstants.PREF_SHOW_MARKERS));
+ CVSProviderPlugin.getPlugin().setReplaceUnmanaged(store.getBoolean(ICVSUIConstants.PREF_REPLACE_UNMANAGED));
}
/**
@@ -217,7 +219,7 @@ public class CVSUIPlugin extends AbstractUIPlugin {
*/
public void startup() throws CoreException {
super.startup();
- Policy.localize("org.eclipse.team.internal.ccvs.ui.messages");
+ Policy.localize("org.eclipse.team.internal.ccvs.ui.messages"); //$NON-NLS-1$
CVSAdapterFactory factory = new CVSAdapterFactory();
Platform.getAdapterManager().registerAdapters(factory, ICVSRemoteFile.class);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index 43c77cb70..9041378a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -13,86 +13,87 @@ package org.eclipse.team.internal.ccvs.ui;
public interface ICVSUIConstants {
// image paths
- public final String ICON_PATH_FULL = "icons/full/";
- public final String ICON_PATH_BASIC = "icons/basic/";
+ public final String ICON_PATH_FULL = "icons/full/"; //$NON-NLS-1$
+ public final String ICON_PATH_BASIC = "icons/basic/"; //$NON-NLS-1$
// images
// overlays
- public final String IMG_MERGEABLE_CONFLICT = "ovr16/confauto_ov.gif";
- public final String IMG_QUESTIONABLE = "ovr16/question_ov.gif";
- public final String IMG_MERGED = "ovr16/merged_ov.gif";
+ public final String IMG_MERGEABLE_CONFLICT = "ovr16/confauto_ov.gif"; //$NON-NLS-1$
+ public final String IMG_QUESTIONABLE = "ovr16/question_ov.gif"; //$NON-NLS-1$
+ public final String IMG_MERGED = "ovr16/merged_ov.gif"; //$NON-NLS-1$
// objects
- public final String IMG_REPOSITORY = "obj16/repository_rep.gif";
- public final String IMG_TAG = "obj16/tag.gif";
- public final String IMG_BRANCHES_CATEGORY = "obj16/branches_rep.gif";
- public final String IMG_VERSIONS_CATEGORY = "obj16/versions_rep.gif";
- public final String IMG_PROJECT_VERSION = "obj16/prjversions_rep.gif";
+ public final String IMG_REPOSITORY = "obj16/repository_rep.gif"; //$NON-NLS-1$
+ public final String IMG_TAG = "obj16/tag.gif"; //$NON-NLS-1$
+ public final String IMG_BRANCHES_CATEGORY = "obj16/branches_rep.gif"; //$NON-NLS-1$
+ public final String IMG_VERSIONS_CATEGORY = "obj16/versions_rep.gif"; //$NON-NLS-1$
+ public final String IMG_PROJECT_VERSION = "obj16/prjversions_rep.gif"; //$NON-NLS-1$
// toolbar
- public final String IMG_REFRESH = "clcl16/refresh.gif";
- public final String IMG_CLEAR = "clcl16/clear_co.gif";
+ public final String IMG_REFRESH = "clcl16/refresh.gif"; //$NON-NLS-1$
+ public final String IMG_CLEAR = "clcl16/clear_co.gif"; //$NON-NLS-1$
// wizards
- public final String IMG_NEWLOCATION = "wizards/newlocation_wiz.gif";
+ public final String IMG_NEWLOCATION = "wizards/newlocation_wiz.gif"; //$NON-NLS-1$
// preferences
- public final String PREF_SHOW_COMMENTS = "pref_show_comments";
- public final String PREF_SHOW_TAGS = "pref_show_tags";
- public final String PREF_PRUNE_EMPTY_DIRECTORIES = "pref_prune_empty_directories";
- public final String PREF_TIMEOUT = "pref_timeout";
- public final String PREF_QUIETNESS = "pref_quietness";
- public final String PREF_SHOW_MODULES = "pref_show_modules";
- public final String PREF_HISTORY_TRACKS_SELECTION = "pref_history_tracks_selection";
- public final String PREF_CVS_RSH = "pref_cvs_rsh";
- public final String PREF_CVS_SERVER = "pref_cvs_server";
- public final String PREF_CONSIDER_CONTENTS = "pref_consider_contents";
- public final String PREF_PROMPT_ON_FILE_DELETE = "pref_prompt_on_file_delete";
- public final String PREF_PROMPT_ON_FOLDER_DELETE = "pref_prompt_on_folder_delete";
- public final String PREF_SHOW_MARKERS = "pref_show_markers";
+ public final String PREF_SHOW_COMMENTS = "pref_show_comments"; //$NON-NLS-1$
+ public final String PREF_SHOW_TAGS = "pref_show_tags"; //$NON-NLS-1$
+ public final String PREF_PRUNE_EMPTY_DIRECTORIES = "pref_prune_empty_directories"; //$NON-NLS-1$
+ public final String PREF_TIMEOUT = "pref_timeout"; //$NON-NLS-1$
+ public final String PREF_QUIETNESS = "pref_quietness"; //$NON-NLS-1$
+ public final String PREF_SHOW_MODULES = "pref_show_modules"; //$NON-NLS-1$
+ public final String PREF_HISTORY_TRACKS_SELECTION = "pref_history_tracks_selection"; //$NON-NLS-1$
+ public final String PREF_CVS_RSH = "pref_cvs_rsh"; //$NON-NLS-1$
+ public final String PREF_CVS_SERVER = "pref_cvs_server"; //$NON-NLS-1$
+ public final String PREF_CONSIDER_CONTENTS = "pref_consider_contents"; //$NON-NLS-1$
+ public final String PREF_PROMPT_ON_FILE_DELETE = "pref_prompt_on_file_delete"; //$NON-NLS-1$
+ public final String PREF_PROMPT_ON_FOLDER_DELETE = "pref_prompt_on_folder_delete"; //$NON-NLS-1$
+ public final String PREF_SHOW_MARKERS = "pref_show_markers"; //$NON-NLS-1$
+ public final String PREF_REPLACE_UNMANAGED = "pref_replace_unmanaged"; //$NON-NLS-1$
// console preferences
- public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color";
- public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color";
- public final String PREF_CONSOLE_ERROR_COLOR = "pref_console_error_color";
- public final String PREF_CONSOLE_FONT = "pref_console_font";
- public final String PREF_CONSOLE_AUTO_OPEN = "pref_console_auto_open";
+ public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$
+ public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$
+ public final String PREF_CONSOLE_ERROR_COLOR = "pref_console_error_color"; //$NON-NLS-1$
+ public final String PREF_CONSOLE_FONT = "pref_console_font"; //$NON-NLS-1$
+ public final String PREF_CONSOLE_AUTO_OPEN = "pref_console_auto_open"; //$NON-NLS-1$
// decorator preferences
- public final String PREF_FILETEXT_DECORATION = "pref_filetext_decoration";
- public final String PREF_FOLDERTEXT_DECORATION = "pref_foldertext_decoration";
- public final String PREF_PROJECTTEXT_DECORATION = "pref_projecttext_decoration";
+ public final String PREF_FILETEXT_DECORATION = "pref_filetext_decoration"; //$NON-NLS-1$
+ public final String PREF_FOLDERTEXT_DECORATION = "pref_foldertext_decoration"; //$NON-NLS-1$
+ public final String PREF_PROJECTTEXT_DECORATION = "pref_projecttext_decoration"; //$NON-NLS-1$
- public final String PREF_SHOW_DIRTY_DECORATION = "pref_show_overlaydirty";
- public final String PREF_SHOW_ADDED_DECORATION = "pref_show_added";
- public final String PREF_SHOW_HASREMOTE_DECORATION = "pref_show_hasremote";
+ public final String PREF_SHOW_DIRTY_DECORATION = "pref_show_overlaydirty"; //$NON-NLS-1$
+ public final String PREF_SHOW_ADDED_DECORATION = "pref_show_added"; //$NON-NLS-1$
+ public final String PREF_SHOW_HASREMOTE_DECORATION = "pref_show_hasremote"; //$NON-NLS-1$
- public final String PREF_DIRTY_FLAG = "pref_dirty_flag";
- public final String PREF_ADDED_FLAG = "pref_added_flag";
+ public final String PREF_DIRTY_FLAG = "pref_dirty_flag"; //$NON-NLS-1$
+ public final String PREF_ADDED_FLAG = "pref_added_flag"; //$NON-NLS-1$
- public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty";
+ public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty"; //$NON-NLS-1$
// Wizard banners
- public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif";
- public final String IMG_WIZBAN_BRANCH = "wizban/newstream_wizban.gif";
- public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.gif";
+ public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif"; //$NON-NLS-1$
+ public final String IMG_WIZBAN_BRANCH = "wizban/newstream_wizban.gif"; //$NON-NLS-1$
+ public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.gif"; //$NON-NLS-1$
// Properties
- public final String PROP_NAME = "cvs.name";
- public final String PROP_REVISION = "cvs.revision";
- public final String PROP_AUTHOR = "cvs.author";
- public final String PROP_COMMENT = "cvs.comment";
- public final String PROP_DATE = "cvs.date";
- public final String PROP_DIRTY = "cvs.dirty";
- public final String PROP_MODIFIED = "cvs.modified";
- public final String PROP_KEYWORD = "cvs.date";
- public final String PROP_TAG = "cvs.tag";
- public final String PROP_PERMISSIONS = "cvs.permissions";
- public final String PROP_HOST = "cvs.host";
- public final String PROP_USER = "cvs.user";
- public final String PROP_METHOD = "cvs.method";
- public final String PROP_PORT = "cvs.port";
- public final String PROP_ROOT = "cvs.root";
+ public final String PROP_NAME = "cvs.name"; //$NON-NLS-1$
+ public final String PROP_REVISION = "cvs.revision"; //$NON-NLS-1$
+ public final String PROP_AUTHOR = "cvs.author"; //$NON-NLS-1$
+ public final String PROP_COMMENT = "cvs.comment"; //$NON-NLS-1$
+ public final String PROP_DATE = "cvs.date"; //$NON-NLS-1$
+ public final String PROP_DIRTY = "cvs.dirty"; //$NON-NLS-1$
+ public final String PROP_MODIFIED = "cvs.modified"; //$NON-NLS-1$
+ public final String PROP_KEYWORD = "cvs.date"; //$NON-NLS-1$
+ public final String PROP_TAG = "cvs.tag"; //$NON-NLS-1$
+ public final String PROP_PERMISSIONS = "cvs.permissions"; //$NON-NLS-1$
+ public final String PROP_HOST = "cvs.host"; //$NON-NLS-1$
+ public final String PROP_USER = "cvs.user"; //$NON-NLS-1$
+ public final String PROP_METHOD = "cvs.method"; //$NON-NLS-1$
+ public final String PROP_PORT = "cvs.port"; //$NON-NLS-1$
+ public final String PROP_ROOT = "cvs.root"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index c4486579b..f7d28ff97 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -146,7 +146,9 @@ CVSPreferencePage.promptOnFileDeleteTooltip=Deletion of managed files results in
CVSPreferencePage.promptOnFolderDelete=Prompt for confirmation on deletion of managed &folders
CVSPreferencePage.promptOnFolderDeleteTooltip=Deletion of managed folders deletes any child files but not the folder or any sub-folders. \nAny deleted files will result in outgoing deletion that will be sent to the server on the next commit. \nThe user can choose to be prompted for confirmation on the deletion of managed folders.
CVSPreferencePage.showAddRemoveMarkers=Show &markers for added and removed resources in the Task view
-CVSPreferencePage.showAddRemoveMarkersTooltip=Markers will be placed in the task view for resources that have been locally removed but not committed and resources that have been locally added but not placed under CVS control.
+CVSPreferencePage.showAddRemoveMarkersTooltip=Markers will be placed in the task view for resources that have been locally removed but not \ncommitted and resources that have been locally added but not placed under CVS control.
+CVSPreferencePage.replaceUnmanaged=&Delete unmanaged resources on any Replace With operation
+CVSPreferencePage.replaceUnmanagedTooltip=On a Replace With... operation, files that are not under CVS control can be left as is or deleted automatically.
CVSRemoteFilePropertySource.name=Name
CVSRemoteFilePropertySource.revision=Revision

Back to the top