Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 2c8ca08..cceea76 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -77,6 +77,12 @@ static CString ColStatusGet(const DIFFITEM & di)
        case FILE_SAME:
                VERIFY(s.LoadString(IDS_IDENTICAL));
                break;
+       case FILE_SKIP:
+               VERIFY(s.LoadString(IDS_FILE_SKIPPED));
+               break;
+       case FILE_DIRSKIP:
+               VERIFY(s.LoadString(IDS_DIR_SKIPPED));
+               break;
        default: // error
                VERIFY(s.LoadString(IDS_CANT_COMPARE_FILES));
                break;
@@ -173,6 +179,8 @@ static CString ColStatusAbbrGet(const DIFFITEM & di)
        case FILE_RDIRUNIQUE:
                id = IDS_RIGHTONLY; break;
        case FILE_SAME: id = IDS_IDENTICAL; break;
+       case FILE_SKIP: id = IDS_FILE_SKIPPED; break;
+       case FILE_DIRSKIP: id = IDS_DIR_SKIPPED; break;
        default: id = IDS_CANT_COMPARE_FILES;
        }
        CString s;

diff --git a/Src/Merge.rc b/Src/Merge.rc
index fa03d44..756e444 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,7 +1,5 @@
 //Microsoft Developer Studio generated resource script.
 //
-// $Id$
-
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -29,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#define _AFX_NO_OLE_RESOURCES\r\n"
     "#define _AFX_NO_TRACKER_RESOURCES\r\n"
@@ -75,7 +73,7 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_DIFFVIEW MENU DISCARDABLE 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
@@ -95,7 +93,7 @@ BEGIN
     END
 END
 
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE
+IDR_MAINFRAME MENU PRELOAD DISCARDABLE 
 BEGIN
     POPUP "&File"
     BEGIN
@@ -173,7 +171,7 @@ BEGIN
     END
 END
 
-IDR_POPUP_DIRVIEW MENU DISCARDABLE
+IDR_POPUP_DIRVIEW MENU DISCARDABLE 
 BEGIN
     POPUP "_ITEM_POPUP_"
     BEGIN
@@ -194,7 +192,7 @@ BEGIN
     END
 END
 
-IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
@@ -209,7 +207,7 @@ END
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
 BEGIN
     "A",            ID_EDIT_SELECT_ALL,     VIRTKEY, CONTROL, NOINVERT
     "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
@@ -781,14 +779,14 @@ IDR_MARGIN_CURSOR       CURSOR  DISCARDABLE     "res\\mg_cur.cur"
 // String Table
 //
 
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE 
 BEGIN
     IDR_MAINFRAME           "WinMerge"
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
 END
 
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE 
 BEGIN
     IDS_VERSION_FMT         "Version %1"
     IDS_ALLFILES            "All Files (*.*)|*.*||"
@@ -806,13 +804,13 @@ BEGIN
     IDS_CANT_COMPARE_FILES  "Unable to compare files"
 END
 
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE 
 BEGIN
     AFX_IDS_APP_TITLE       "WinMerge"
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
@@ -822,7 +820,7 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_FILE_NEW             "Create a new document\nNew"
     ID_FILE_OPEN            "Open an existing document\nOpen (Ctrl+O)"
@@ -835,13 +833,13 @@ BEGIN
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
     ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
     ID_FILE_MRU_FILE2       "Open this document"
@@ -861,13 +859,13 @@ BEGIN
     ID_FILE_MRU_FILE16      "Open this document"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_WINDOW_NEW           "Open another window for the active document\nNew Window"
     ID_WINDOW_ARRANGE       "Arrange icons at the bottom of the window\nArrange Icons"
@@ -877,7 +875,7 @@ BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
     ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
@@ -892,13 +890,13 @@ BEGIN
     ID_EDIT_REDO            "Redo the previously undone action\nRedo"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
     AFX_IDS_SCMOVE          "Change the window position"
@@ -909,19 +907,19 @@ BEGIN
     AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     AFX_IDS_SCRESTORE       "Restore the window to normal size"
     AFX_IDS_SCTASKLIST      "Activate Task List"
     AFX_IDS_MDICHILD        "Activate this window"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_L2R                  "Copy the selected text to the right file\nCopy Right (Alt Right)"
     ID_R2L                  "Copy the selected text to the left file\nCopy Left (Alt Left)"
@@ -929,13 +927,13 @@ BEGIN
     ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences"
     ID_PREVDIFF             "Scroll to the previous difference\nPrev Diff (Alt Up)"
     ID_NEXTDIFF             "Scroll to the next difference\nNext Diff (Alt Down)"
-    ID_OPTIONS_BACKUPORIGINALFILE
+    ID_OPTIONS_BACKUPORIGINALFILE 
                             "Save a copy of the original as *.bak\nBackup"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
+    ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE 
                             "Automatically scrolls to the first difference\nScroll First"
     ID_OPTIONS_IGNOREWHITESPACE "Disregards whitespace when comparing files"
     ID_HIDE_BACKUP_FILES    "Hides files with extension BAK"
@@ -949,7 +947,7 @@ BEGIN
     ID_DIR_COPY_FILE_TO_LEFT "Copy selected file to named directory"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_DIR_COPY_FILE_TO_RIGHT "Copy selected file to named directory"
     ID_VIEW_LANGUAGE        "Select the current user interfacce language\nLanguage"
@@ -962,7 +960,7 @@ BEGIN
     ID_DIR_DEL_RIGHT        "Delete selected item on right"
     ID_DIFFSTATUS           "placeholder for status count"
     ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side"
-    ID_OPTIONS_SHOWUNIQUERIGHT
+    ID_OPTIONS_SHOWUNIQUERIGHT 
                             "Displays files that exist in only on right side"
     ID_DIR_DEL_BOTH         "Delete selected item(s) on both sides"
     ID_DIR_OPEN_LEFT        "Open left file"
@@ -970,12 +968,12 @@ BEGIN
     ID_DIR_OPEN_RIGHT       "Open right file"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_SAVE_AS_TITLE       "Save As"
-    IDS_SELECT_FILES_OR_FOLDERS
+    IDS_SELECT_FILES_OR_FOLDERS 
                             "Your selections must be either both files or both folders"
-    IDS_BACKUP_FAILED_PROMPT
+    IDS_BACKUP_FAILED_PROMPT 
                             "Unable to backup original file.\nContinue anyway?"
     IDS_OPTIONS_TITLE       "Options"
     IDS_OPEN_TITLE          "Open"
@@ -992,7 +990,7 @@ BEGIN
     IDS_NOPROJECT           "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_AFRIKAANS           "Afrikaans"
     IDS_ALBANIAN            "Albanian"
@@ -1168,17 +1166,17 @@ BEGIN
     IDS_CC_CMD              "&Path to cleartool.exe :"
     IDS_VSS_CMD             "&Path to SS.EXE :"
     IDS_VSS_RUN_ERROR       "Error executing versioning system command."
-    IDS_DIFF_OPEN_NO_SET_PROPS
+    IDS_DIFF_OPEN_NO_SET_PROPS 
                             "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
     IDS_COLHDR_LTIMEM       "Left Date"
     IDS_COLHDR_RTIMEM       "Right Date"
     IDS_COLHDR_EXTENSION    "Extension"
-    IDS_CONFIRM_DELETE_ITEMS
+    IDS_CONFIRM_DELETE_ITEMS 
                             "Are you sure you want to delete %1 of %2 selected item(s) ?"
     IDS_DEL_LEFT_FMT        "Delete left side %1 of %2 selected item(s)"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DEL_RIGHT_FMT       "Delete right side %1 of %2 selected item(s)"
     IDS_DELETE_FILE_FAILED  "Delete file %1 failed: %2"
@@ -1187,6 +1185,7 @@ BEGIN
     IDS_COPY_TO_LEFT        "Copy to left side %1 of %2 selected item(s)"
     IDS_DEL_BOTH_FMT        "Delete both sides %1 of %2 selected item(s)"
     IDS_COPY_TO_RIGHT       "Copy to right side %1 of %2 selected item(s)"
+    IDS_COLHDR_LSIZE        "Left Size"
     IDS_DELETE_DIR_FAILED   "Delete directory %1 failed: %s"
     IDS_COPY_FILE_FAILED    "Copying file %1 failed: %2"
     IDS_COPY_DIR_FAILED     "Copying directory %1 failed: %2"
@@ -1197,7 +1196,7 @@ BEGIN
     IDS_BIN_FILES_SAME      "Binary files are identical"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     ID_DIR_OPEN_RIGHT_WITH  "Open right file with..."
     ID_OPTIONS_SHOWBINARIES "Displays binary files"
@@ -1208,7 +1207,7 @@ BEGIN
     ID_EDITOR_COPY_FILENAME "Copy Filename"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_FILESAVE_FAILED     "Saving %1 failed. Would you like to save the file under a different name?"
     IDS_ERROR_FILE_NOT_FOUND "File not found: %1"
@@ -1228,7 +1227,7 @@ BEGIN
     IDS_COLHDR_RVERSION     "Right File Version"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_NUM_REPLACED        "Replaced %1 string(s)."
     IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s"""
@@ -1236,7 +1235,7 @@ BEGIN
     IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
 END
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE 
 BEGIN
     IDC_STATIC_TITLE_LEFT   "Right click on the path to copy"
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
@@ -1249,7 +1248,8 @@ BEGIN
     IDS_COLHDR_RESULT_ABBR  "Short Result"
     IDS_COLHDR_LATTRIBUTES  "Left Attributes"
     IDS_COLHDR_RATTRIBUTES  "Right Attributes"
-    IDS_COLHDR_LSIZE        "Left Size"
+    IDS_FILE_SKIPPED        "File skipped"
+    IDS_DIR_SKIPPED         "Directory skipped"
 END
 
 #endif    // English (U.S.) resources

diff --git a/Src/readme.txt b/Src/readme.txt
index 1181417..6f3305b 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -17,6 +17,8 @@
   WinMerge:: DiffContext.cpp
  Bugfix: Don't prefix subdirectories with dot in ColPathGet.
   WinMerge: DirViewColItems.cpp
+ Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
+  WinMerge: DirViewColItems.cpp Merge.rc resource.h
 
 2003-08-22 Kimmo
  PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)

diff --git a/Src/resource.h b/Src/resource.h
index 2c36296..01b8c1c 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -114,7 +114,9 @@
 #define IDS_COLHDR_LATTRIBUTES          211
 #define IDS_COLHDR_RATTRIBUTES          212
 #define IDB_EQUAL                       213
+#define IDS_FILE_SKIPPED                213
 #define IDB_NOTEQUAL                    214
+#define IDS_DIR_SKIPPED                 214
 #define IDB_RFOLDER                     215
 #define IDB_UNKNOWN                     216
 #define IDB_BINARYSAME                  217