Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-04-15 14:15:02 -0400
committerJean Michel-Lemieux2002-04-15 14:15:02 -0400
commit2a99b1a2dd11b9d93c9e2b5ac9aac75d824c7d6e (patch)
tree871042a4a5f698910269d17fe0b25c0643fbaae4
parent8e64d63bc725d2a3d5ecd21acf83a86a1bb2f640 (diff)
downloadeclipse.platform.team-2a99b1a2dd11b9d93c9e2b5ac9aac75d824c7d6e.tar.gz
eclipse.platform.team-2a99b1a2dd11b9d93c9e2b5ac9aac75d824c7d6e.tar.xz
eclipse.platform.team-2a99b1a2dd11b9d93c9e2b5ac9aac75d824c7d6e.zip
Bug 12703: Problems creating patch file - new files not included
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java12
2 files changed, 9 insertions, 7 deletions
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 14489870e..98de5f42e 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
@@ -536,8 +536,8 @@ patch.txt_6=patch.txt
Save_In_Workspace_7=Save In Workspace
Select_a_folder_then_type_in_the_file_name__8=Select a folder then type in the file name:
Fi&le_name__9=Fi&le name:
-Do_not_recurse_into_sub-folders_10=Do not recurse into sub-folders
-Do_not_include_new_files_in_patch_11=Do not include new files in patch
+Do_not_recurse_into_sub-folders_10=Recurse into sub-folders
+Do_not_include_new_files_in_patch_11=Include new files in patch
Diff_output_format_12=Diff output format
Unified_(format_required_by_Compare_With_Patch_feature)_13=Unified (format required by Compare With Patch feature)
Context_14=Context
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index 5262b47d3..5a6138b45 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -354,7 +354,7 @@ public class GenerateDiffFileWizard extends Wizard {
private Button contextDiffOption;
private Button unifiedDiffOption;
private Button regularDiffOption;
- private Button dontIncludeNewFilesOptions;
+ private Button includeNewFilesOptions;
/**
* Constructor for PatchFileCreationOptionsPage.
@@ -382,9 +382,11 @@ public class GenerateDiffFileWizard extends Wizard {
recurseOption = new Button(composite, SWT.CHECK);
recurseOption.setText(Policy.bind("Do_not_recurse_into_sub-folders_10")); //$NON-NLS-1$
+ recurseOption.setSelection(true);
- dontIncludeNewFilesOptions = new Button(composite, SWT.CHECK);
- dontIncludeNewFilesOptions.setText(Policy.bind("Do_not_include_new_files_in_patch_11")); //$NON-NLS-1$
+ includeNewFilesOptions = new Button(composite, SWT.CHECK);
+ includeNewFilesOptions.setText(Policy.bind("Do_not_include_new_files_in_patch_11")); //$NON-NLS-1$
+ includeNewFilesOptions.setSelection(true);
Group diffTypeGroup = new Group(composite, SWT.NONE);
layout = new GridLayout();
@@ -415,10 +417,10 @@ public class GenerateDiffFileWizard extends Wizard {
*/
public LocalOption[] getOptions() {
List options = new ArrayList(5);
- if(!dontIncludeNewFilesOptions.getSelection()) {
+ if(includeNewFilesOptions.getSelection()) {
options.add(Diff.INCLUDE_NEWFILES);
}
- if(recurseOption.getSelection()) {
+ if(!recurseOption.getSelection()) {
options.add(Diff.DO_NOT_RECURSE);
}
if(unifiedDiffOption.getSelection()) {

Back to the top