Index: C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/operations/RevertOperation.java =================================================================== --- C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/operations/RevertOperation.java (revision 2067) +++ C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/operations/RevertOperation.java (working copy) @@ -6,7 +6,9 @@ import org.tigris.subversion.subclipse.core.SVNException; import org.tigris.subversion.subclipse.core.SVNTeamProvider; import org.tigris.subversion.subclipse.core.commands.RevertResourcesCommand; +import org.tigris.subversion.subclipse.ui.ISVNUIConstants; import org.tigris.subversion.subclipse.ui.Policy; +import org.tigris.subversion.subclipse.ui.SVNUIPlugin; public class RevertOperation extends RepositoryProviderOperation { @@ -34,8 +36,9 @@ */ protected void execute(SVNTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws SVNException, InterruptedException { monitor.beginTask(null, 100); - try { - RevertResourcesCommand command = new RevertResourcesCommand(provider.getSVNWorkspaceRoot(),resources); + try { + final boolean deleteUnmanagedResources = SVNUIPlugin.getPlugin().getPreferenceStore().getBoolean(ISVNUIConstants.PREF_DELETE_UNMANAGED_RESOURCES); + RevertResourcesCommand command = new RevertResourcesCommand(provider.getSVNWorkspaceRoot(),resources,deleteUnmanagedResources); command.run(Policy.subMonitorFor(monitor,100)); } catch (SVNException e) { collectStatus(e.getStatus()); Index: C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/ISVNUIConstants.java =================================================================== --- C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/ISVNUIConstants.java (revision 2067) +++ C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/ISVNUIConstants.java (working copy) @@ -112,6 +112,7 @@ public final String PREF_TEXT_KSUBST = "pref_text_ksubst"; //$NON-NLS-1$ public final String PREF_FETCH_CHANGE_PATH_ON_DEMAND = "pref_fetch_change_path_on_Demand"; //$NON-NLS-1$ public final String PREF_SHOW_TAGS_IN_REMOTE = "pref_show_tags_in_remote"; //$NON-NLS-1$ + public final String PREF_DELETE_UNMANAGED_RESOURCES = "pref_delete_unmanaged_resources"; //$NON-NLS-1$ public final String PREF_LOG_ENTRIES_TO_FETCH = "pref_log_entries_to_fetch"; //$NON-NLS-1$ public final String PREF_STOP_ON_COPY = "pref_stop_on_copy"; //$NON-NLS-1$ Index: C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java =================================================================== --- C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java (revision 2067) +++ C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java (working copy) @@ -60,6 +60,7 @@ private Button showCompareRevisionInDialog; private Button fetchChangePathOnDemand; private Button showTagsInRemoteHistory; + private Button deleteUnmanagedResources; private Button selectUnadded; private Text logEntriesToFetchText; private Button defaultConfigLocationRadio; @@ -139,6 +140,8 @@ fetchChangePathOnDemand = createCheckBox(composite, Policy.bind("SVNPreferencePage.fetchChangePathOnDemand")); //$NON-NLS-1$ showTagsInRemoteHistory = createCheckBox(composite, Policy.bind("SVNPreferencePage.showTags")); //$NON-NLS-1$ + + deleteUnmanagedResources = createCheckBox(composite, Policy.bind("SVNPreferencePage.deleteUnmanagedResources")); //$NON-NLS-1$ createLabel(composite, "", 2); //$NON-NLS-1$ createLabel(composite, Policy.bind("SVNPreferencePage.logEntriesToFetch"), 1); //$NON-NLS-1$ @@ -231,6 +234,8 @@ fetchChangePathOnDemand.setSelection(store.getBoolean(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND)); showTagsInRemoteHistory.setSelection(store.getBoolean(ISVNUIConstants.PREF_SHOW_TAGS_IN_REMOTE)); + + deleteUnmanagedResources.setSelection(store.getBoolean(ISVNUIConstants.PREF_DELETE_UNMANAGED_RESOURCES)); selectUnadded.setSelection(store.getBoolean(ISVNUIConstants.PREF_SELECT_UNADDED_RESOURCES_ON_COMMIT)); @@ -276,6 +281,8 @@ store.setValue(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND, fetchChangePathOnDemand.getSelection()); store.setValue(ISVNUIConstants.PREF_SHOW_TAGS_IN_REMOTE, showTagsInRemoteHistory.getSelection()); + + store.setValue(ISVNUIConstants.PREF_DELETE_UNMANAGED_RESOURCES, deleteUnmanagedResources.getSelection()); // save select unadded resources on commit pref store.setValue(ISVNUIConstants.PREF_SELECT_UNADDED_RESOURCES_ON_COMMIT, selectUnadded.getSelection()); Index: C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/messages.properties =================================================================== --- C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/messages.properties (revision 2067) +++ C:/home/paul/workspace-other/ui/src/org/tigris/subversion/subclipse/ui/messages.properties (working copy) @@ -758,6 +758,7 @@ SVNPreferencePage.compressionLevel=Compression &level: SVNPreferencePage.considerContentsInCompare=Con&sider file contents in comparisons SVNPreferencePage.defaultTextKSubst=Default &keyword substitution: +SVNPreferencePage.deleteUnmanagedResources=Delete unmanaged resources on replace/revert SVNPreferencePage.description=General SVN settings: SVNPreferencePage.determineVersionEnabled=&Validate server version compatibility on first connection SVNPreferencePage.javahlNotAvailable=JavaHL interface is not available. Check your environment. Index: C:/home/paul/workspace-other/ui/plugin.properties =================================================================== --- C:/home/paul/workspace-other/ui/plugin.properties (revision 2067) +++ C:/home/paul/workspace-other/ui/plugin.properties (working copy) @@ -139,6 +139,9 @@ SVNActionSet.syncLabel=Synchronize SVN Projects SVNActionSet.syncTooltip=Synchronize SVN Projects SVNCompareParticipant=SVN Compare +SVNConflictFilter.name=Non-SVN Conflicts +SVNConflictFilter.name=Non-SVN Conflicts +SVNConflictFilter.description=Filters out elements which aren't subversion conflicts SVNConsoleFont.description=The font for the SVN console. SVNConsoleFont.label=SVN Console Font SVNGroupMenu.label=S&VN Index: C:/home/paul/workspace-other/ui/plugin.xml =================================================================== --- C:/home/paul/workspace-other/ui/plugin.xml (revision 2067) +++ C:/home/paul/workspace-other/ui/plugin.xml (working copy) @@ -998,6 +998,15 @@ 215,v2.0,/tags/v2.0,tag + + + Index: C:/home/paul/workspace-other/ui/META-INF/MANIFEST.MF =================================================================== --- C:/home/paul/workspace-other/ui/META-INF/MANIFEST.MF (revision 2067) +++ C:/home/paul/workspace-other/ui/META-INF/MANIFEST.MF (working copy) @@ -20,7 +20,9 @@ org.eclipse.compare, org.eclipse.osgi, org.eclipse.ui.console, - org.eclipse.help + org.eclipse.help, + org.eclipse.jdt.ui, + org.eclipse.jdt.core Eclipse-AutoStart: true Provide-Package: org.tigris.subversion.subclipse.ui, org.tigris.subversion.subclipse.ui.actions,