OSDN Git Service
Perry Rapp [Sun, 7 Aug 2005 20:27:57 +0000 (20:27 +0000)]
PATCH: [
1248259 ] Preserve trivial diffs in diff chain
Src: DiffList.cpp DiffList.h DiffWrapper.cpp LocationView.cpp
LocationView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
MergeDoc.cpp MergeEditView.cpp MergeEditView.h
Kimmo Varis [Sun, 7 Aug 2005 11:48:22 +0000 (11:48 +0000)]
PATCH: [
1253350 ] Use new-style folder browse dialog
Kimmo Varis [Sun, 7 Aug 2005 11:40:54 +0000 (11:40 +0000)]
PATCH: [
1253205 ] Remove dynamic dll loading from FilePathEdit
Kimmo Varis [Sun, 7 Aug 2005 11:29:33 +0000 (11:29 +0000)]
PATCH: [
1253100 ] Shorter paths in captions
Kimmo Varis [Sat, 6 Aug 2005 09:13:45 +0000 (09:13 +0000)]
PATCH: [
1201945 ] Localization of ShellExtension.dll
- submitted by Takashi Sawanaka
Kimmo Varis [Sat, 6 Aug 2005 08:27:07 +0000 (08:27 +0000)]
PATCH: [
1150083 ] plugin to filter C-style comments CPP/JS/PHP
- submitted by daemonui
Kimmo Varis [Fri, 5 Aug 2005 21:09:17 +0000 (21:09 +0000)]
PATCH: [
1249646 ] Register Shell Edit handler for projectfiles
Kimmo Varis [Fri, 5 Aug 2005 20:14:16 +0000 (20:14 +0000)]
PATCH: [
1238168 ] Convert using BCMenu with pointers
Kimmo Varis [Fri, 5 Aug 2005 20:06:06 +0000 (20:06 +0000)]
Remove accidentally added letter before comment begin.
Kimmo Varis [Fri, 5 Aug 2005 17:36:24 +0000 (17:36 +0000)]
PATCH: [
1252076 ] Improve About-dialog (unicode info, better layout)
Kimmo Varis [Thu, 4 Aug 2005 18:23:51 +0000 (18:23 +0000)]
BUG: [
1247700 ] Cannot browse to parent folders of selected folders
- Fix from Jochen
Perry Rapp [Sun, 31 Jul 2005 03:15:37 +0000 (03:15 +0000)]
2005-07-31 Perry
PATCH: [
1248180 ] fix moved block code
BUG: [
1248172 ] Assert failure in CDiffWrapper::RunFileDiff
BUG: [
1186199 ] Assert from moved block code
Src: DiffWrapper.cpp
Perry Rapp [Sat, 30 Jul 2005 18:48:15 +0000 (18:48 +0000)]
Cosmetic: grammar fix in comment ("same...than" => "same...as")
Src/LocationView.cpp
Perry Rapp [Sat, 30 Jul 2005 17:20:14 +0000 (17:20 +0000)]
2005-07-30 Perry
PATCH: [
1247483 ] Create folder if one doesn't exist (for reports and patches)
BUG: [
1248017 ] WinMerge\Src\DirCmpReport.cpp(80) : error C2065: 'IDS_FOLDER
Creating IDS_FOLDER_NOTEXIST as "Folder does not exist." and checking in to cvs trunk.
Src: Merge.rc resource.h
Src/Languages: resource.h Merge*.rc
Kimmo Varis [Sat, 30 Jul 2005 12:29:55 +0000 (12:29 +0000)]
PATCH: [
1247483 ] Create folder if one doesn't exist (for reports and patches)
Kimmo Varis [Sat, 30 Jul 2005 12:25:49 +0000 (12:25 +0000)]
PATCH: [
1247375 ] Use Shell Edit command primarily to open files
Kimmo Varis [Fri, 29 Jul 2005 11:13:09 +0000 (11:13 +0000)]
PATCH: [
1245773 ] Scan full files in quick contents compare
Kimmo Varis [Tue, 26 Jul 2005 21:02:04 +0000 (21:02 +0000)]
PATCH: [
1208493 ] Suggest change in title of codepage options
Perry Rapp [Tue, 26 Jul 2005 14:50:10 +0000 (14:50 +0000)]
PATCH: [
1208208 ] Move resizeable dialogs position in registry
Src: OpenDlg.cpp SaveClosingDlg.cpp
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
Perry Rapp [Tue, 26 Jul 2005 14:36:47 +0000 (14:36 +0000)]
2005-07-26 Perry
PATCH: [
1242008 ] Update status to binary if open fails because binary
Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.h DirView.cpp
MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
Kimmo Varis [Tue, 26 Jul 2005 08:43:09 +0000 (08:43 +0000)]
Handle empty filename for report
Kimmo Varis [Tue, 26 Jul 2005 07:57:12 +0000 (07:57 +0000)]
PATCH: [
1238174 ] Fix diff counts in quick contents compare
Kimmo Varis [Tue, 26 Jul 2005 07:49:20 +0000 (07:49 +0000)]
Remove invalid ASSERT
Kimmo Varis [Tue, 26 Jul 2005 07:16:56 +0000 (07:16 +0000)]
PATCH: [
1244804 ] Add hourglass for report creating
Perry Rapp [Tue, 26 Jul 2005 06:29:48 +0000 (06:29 +0000)]
PATCH: [
1241275 ] New Shared or Private Filter dialog
New shared filter dialog
Src/Languages: */Merge*.rc */resource.h
Perry Rapp [Tue, 26 Jul 2005 06:11:31 +0000 (06:11 +0000)]
PATCH: [
1241275 ] New Shared or Private Filter dialog
Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp
Merge.dsp Merge.rc paths.cpp paths.h resource.h
Src new files: SharedFilterDlg.cpp SharedFilterDlg.h
Perry Rapp [Tue, 26 Jul 2005 04:23:43 +0000 (04:23 +0000)]
2005-07-26 Perry
PATCH: [
1241270 ] Fix paths.cpp GetDirName for root paths
Src: paths.cpp
Perry Rapp [Mon, 25 Jul 2005 23:41:18 +0000 (23:41 +0000)]
PATCH: [
1241962 ] Record zero byte location info
Src/Common: UniFile.cpp UniFile.h
Perry Rapp [Mon, 25 Jul 2005 23:34:06 +0000 (23:34 +0000)]
PATCH: [
1244808 ] Remove LanguageSelect include from Merge.h
Src: codepage.cpp DirActions.cpp Merge.cpp Merge.h
Src/Common: LanguageSelect.h
Perry Rapp [Mon, 25 Jul 2005 21:39:31 +0000 (21:39 +0000)]
2005-07-25 Perry
BUG: [
1241766 ] Debug warning: Warning: no listbox item selected.
Src/Common: LanguageSelect.cpp LanguageSelect.h
Perry Rapp [Mon, 25 Jul 2005 15:42:37 +0000 (15:42 +0000)]
BUG: [
1244536 ] DisplayXMLFiles missing from Plugins/dlls
Plugins\dlls: new file DisplayXMLFiles.dll
Perry Rapp [Mon, 25 Jul 2005 15:40:19 +0000 (15:40 +0000)]
BUG: [
1244546 ] DisplayXMLFiles linking looks wrong
src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
Perry Rapp [Mon, 25 Jul 2005 15:16:52 +0000 (15:16 +0000)]
2005-07-25 Perry
BUG: [
1244540 ] DisplayXMLFiles doesn't compile
src_VCPP\DisplayXMLFiles: WinMergeScript.cpp
Kimmo Varis [Mon, 25 Jul 2005 12:21:30 +0000 (12:21 +0000)]
BUG: [
1244415 ] Bad T2A call in DirCmpReport::SaveToFile
Kimmo Varis [Mon, 25 Jul 2005 12:07:58 +0000 (12:07 +0000)]
PATCH: [
1243655 ] Directory compare reporting
Kimmo Varis [Mon, 25 Jul 2005 11:51:16 +0000 (11:51 +0000)]
PATCH: [
1243655 ] Directory compare reporting
Perry Rapp [Sun, 24 Jul 2005 22:08:53 +0000 (22:08 +0000)]
2005-07-24 Perry
PATCH: [
1242297 ] Fix CPatchDlg::OnOK for empty paths & greatly simplify
Src: Merge.rc PatchDlg.cpp resource.h
Src/Languages: */resource.h */Merge*.rc
Kimmo Varis [Sun, 24 Jul 2005 15:20:43 +0000 (15:20 +0000)]
PATCH: [
1220485 ] Move Redisplay() from doc to view
Perry Rapp [Sun, 24 Jul 2005 00:19:28 +0000 (00:19 +0000)]
PATCH: [
1241930 ] Rename stringdiffs_Get to sd_ComputeWordDiffs
(This is cosmetic function rename)
Src: MergeDocLineDiffs.cpp stringdiffs.cpp stringdiffs.h stringdiffsi.h
Perry Rapp [Sun, 24 Jul 2005 00:16:14 +0000 (00:16 +0000)]
2005-07-24 Perry
PATCH: [
1211574 ] Wrap GetTempPath and GetTempFileName for CString use
Src: DiffWrapper.cpp FileTransform.cpp PathContext.cpp VSSHelper.cpp
paths.cpp paths.h
Kimmo Varis [Sat, 23 Jul 2005 20:07:28 +0000 (20:07 +0000)]
PATCH: [
1243221 ] Cleanup CompareStats
Kimmo Varis [Sat, 23 Jul 2005 06:56:20 +0000 (06:56 +0000)]
BUG: [
1241289 ] Edit point or "anchor" not updated when navigating diffs
Perry Rapp [Fri, 22 Jul 2005 02:33:16 +0000 (02:33 +0000)]
BUG: [
1241990 ] Typo in MergeDoc.h: additionnal => additional
Fix spelling additionnal => additional
Src: MergeDoc.h MergeEditView.h
Perry Rapp [Fri, 22 Jul 2005 02:30:03 +0000 (02:30 +0000)]
2005-07-22 Perry
PATCH: [
1242339 ] Fix CMergeDoc::Rescan to set bIdentical in all cases
Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
Perry Rapp [Thu, 21 Jul 2005 12:57:19 +0000 (12:57 +0000)]
2005-07-21 Perry
PATCH: [
1226311 ] Record notes about why compare failed
Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Wed, 20 Jul 2005 22:05:38 +0000 (22:05 +0000)]
Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray
Src: MergeDocLineDiffs.cpp
Tim Gerundt [Wed, 20 Jul 2005 21:13:29 +0000 (21:13 +0000)]
PATCH: [
1238450 ] Build script for manual at SF.net
Perry Rapp [Wed, 20 Jul 2005 18:07:57 +0000 (18:07 +0000)]
2005-07-20 Perry
PATCH: [
1241753 ] Fix DirViewColItems int64 cast warnings
Src: DirViewColItems.cpp
Kimmo Varis [Tue, 19 Jul 2005 21:00:44 +0000 (21:00 +0000)]
PATCH: [
1236623 ] Increase Quick contents compare buffer size
Kimmo Varis [Tue, 19 Jul 2005 15:48:41 +0000 (15:48 +0000)]
PATCH: [
1238194 ] Use proper member names in MergeDiffDetailView
Perry Rapp [Mon, 18 Jul 2005 17:30:20 +0000 (17:30 +0000)]
Cosmetic: add explanatory comments to comment inside of SetResourceVersions.wsf
Src: SetResourceVersions.wsf
Perry Rapp [Mon, 18 Jul 2005 16:06:27 +0000 (16:06 +0000)]
2005-07-18 Perry
BUG: [
1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0)
Make all language names capitalized in Spanish, as in Catalan
Src/Languages/Spanish: MergeSpanish.rc
Jochen Tucht [Sun, 17 Jul 2005 15:58:19 +0000 (15:58 +0000)]
no message
Jochen Tucht [Sun, 17 Jul 2005 15:56:37 +0000 (15:56 +0000)]
BUG: [
1239605 ] Cannot open diff due to 7zip error
Perry Rapp [Sun, 17 Jul 2005 01:51:25 +0000 (01:51 +0000)]
2005-07-17 Perry
PATCH: [
1239275 ] Fixes for sd_ComputeByteDiff
Src: stringdiffs.cpp
Jochen Tucht [Fri, 15 Jul 2005 14:17:52 +0000 (14:17 +0000)]
shlwapi.h prior to VC6SP6 might lack definition of StrIsIntlEqual
Jochen Tucht [Fri, 15 Jul 2005 13:23:18 +0000 (13:23 +0000)]
fix comments / use one doxygen comment style
Jochen Tucht [Fri, 15 Jul 2005 08:24:41 +0000 (08:24 +0000)]
no message
Jochen Tucht [Fri, 15 Jul 2005 08:22:13 +0000 (08:22 +0000)]
PATCH: [
1225880 ] Project file parsing based on CMarkdown class
Jochen Tucht [Fri, 15 Jul 2005 08:13:33 +0000 (08:13 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues (w/o command line tool integration)
Kimmo Varis [Wed, 13 Jul 2005 08:47:26 +0000 (08:47 +0000)]
PATCH: [
1236598 ] Add binary file check to quick contents compare
Kimmo Varis [Wed, 13 Jul 2005 07:10:08 +0000 (07:10 +0000)]
PATCH: [
1236602 ] Add icon for messagebox about overwriting patch file
Perry Rapp [Tue, 12 Jul 2005 18:13:11 +0000 (18:13 +0000)]
Spelling fix (existant => existent)
Manual: Command_line.xml
Perry Rapp [Tue, 12 Jul 2005 18:12:05 +0000 (18:12 +0000)]
2005-07-12 Perry
Grammar fix via rewrite for /ub option
Manual: Command_line.xml
Perry Rapp [Mon, 11 Jul 2005 23:20:36 +0000 (23:20 +0000)]
PATCH: [
1234629 ] New Chinese(Simplified) translation .rc file
Src/Languages: MergeChineseSimplified.rc
Perry Rapp [Mon, 11 Jul 2005 20:33:06 +0000 (20:33 +0000)]
PATCH: [
1229024 ] Rename CPropFilter to CPropLineFilter
Rename class
Src: PropLineFilter.cpp PropLineFilter.h
(And adding the new/renamed PropLineFilter.* files)
Perry Rapp [Mon, 11 Jul 2005 20:25:59 +0000 (20:25 +0000)]
2005-07-11 Perry
PATCH: [
1229024 ] Rename CPropFilter to CPropLineFilter
Remove PropFilter.cpp PropFilter.h
Add PropLineFilter.cpp PropLineFilter.h
Src: Merge.dsp MainFrm.cpp
Tim Gerundt [Fri, 8 Jul 2005 22:43:14 +0000 (22:43 +0000)]
PATCH: [
1232760 ] Icon for 'Merge->Delete'
Kimmo Varis [Fri, 8 Jul 2005 13:52:51 +0000 (13:52 +0000)]
PATCH: [
1234793 ] Patch generate: 11-line context doesn't work
Kimmo Varis [Fri, 8 Jul 2005 13:37:21 +0000 (13:37 +0000)]
PATCH: [
1234390 ] Compare >2 MB files with quick contents
Kimmo Varis [Thu, 7 Jul 2005 12:55:05 +0000 (12:55 +0000)]
PATCH: [
1232499 ] Language dialog box Simplified Chinese's name correction
- submitted by xmpdhml at sourceforge.net
Kimmo Varis [Thu, 30 Jun 2005 17:11:58 +0000 (17:11 +0000)]
PATCH: [
1193262 ] Switch language on run-time not change all menus
Kimmo Varis [Thu, 30 Jun 2005 16:54:09 +0000 (16:54 +0000)]
WinMerge beta 2.3.4.0 released
Kimmo Varis [Thu, 30 Jun 2005 16:44:22 +0000 (16:44 +0000)]
Update title for WinMerge 2.3, new revision number 1.1.2
Kimmo Varis [Thu, 30 Jun 2005 16:34:36 +0000 (16:34 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues
Submitted by Jochen, apply some parts now:
Cannot create valid (archive) temp paths without valid document pointer
Kimmo Varis [Thu, 30 Jun 2005 16:30:50 +0000 (16:30 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues
Submitted by Jochen, apply some parts now:
Misc cleanups and optimizations
Kimmo Varis [Thu, 30 Jun 2005 16:16:15 +0000 (16:16 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues
Submitted by Jochen, apply some parts now:
Add missing ProgressBar initialisation
Kimmo Varis [Thu, 30 Jun 2005 16:13:16 +0000 (16:13 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues
Submitted by Jochen, apply some parts now:
DIFFITEM API cleanup, use const CString&
Kimmo Varis [Thu, 30 Jun 2005 15:58:01 +0000 (15:58 +0000)]
PATCH: [
1230344 ] MergeSwedish.rc for 2.3.4.0 beta
- submitted by Hans Eriksson
Kimmo Varis [Thu, 30 Jun 2005 15:54:41 +0000 (15:54 +0000)]
PATCH: [
1228647 ] MergeCatalan.rc v209 update
- submitted by Jordi Vilar
Perry Rapp [Wed, 29 Jun 2005 16:38:46 +0000 (16:38 +0000)]
PATCH: [
1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)
Src: DirDoc.cpp
Kimmo Varis [Wed, 29 Jun 2005 14:30:22 +0000 (14:30 +0000)]
PATCH: [
1229164 ] Add dir compare progress info
Kimmo Varis [Wed, 29 Jun 2005 13:59:13 +0000 (13:59 +0000)]
PATCH: [
1229297 ] Align filesize column text to right
Kimmo Varis [Wed, 29 Jun 2005 13:46:02 +0000 (13:46 +0000)]
PATCH: [
1229315 ] Fix item number for non-recursive compare
Christian List [Tue, 28 Jun 2005 02:15:43 +0000 (02:15 +0000)]
[
1219818 ] Plugin to display XML files
Perry Rapp [Mon, 27 Jun 2005 19:57:52 +0000 (19:57 +0000)]
BUG: [
1228493 ] Copy Pathnames/Right doesn't work
Src: DirView.cpp
Perry Rapp [Mon, 27 Jun 2005 17:20:17 +0000 (17:20 +0000)]
Add example user-specific filter paths to manual.
Add example paths to function header comment of FileFilterHelper::LoadFileFilterDirPattern
Docs/Users/Manual/Filters.xml
Src/FilterFilterHelper.cpp
Perry Rapp [Mon, 27 Jun 2005 17:09:33 +0000 (17:09 +0000)]
Docs/Users/Manual/Filters.xml
(First line in file filters description) Minor grammar fixes,
and rewrite of one incomprehensible line.
Perry Rapp [Mon, 27 Jun 2005 16:42:49 +0000 (16:42 +0000)]
Apply new strings to translated resource files
(IDS_DIRVIEW_STATUS_FMT_FOCUS & IDS_DIRVIEW_STATUS_FMT_NOFOCUS)
Src/Languages: *.rc resource.h
Perry Rapp [Mon, 27 Jun 2005 16:33:15 +0000 (16:33 +0000)]
2005-06-27 Perry
PATCH:
1213781 ] Fill item location into statusbar in dirview
DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.rc resource.h
Kimmo Varis [Thu, 23 Jun 2005 14:12:10 +0000 (14:12 +0000)]
BUG: [
1225257 ] cvs: FileFilters broken?
- Restore behavior in 2.3.3.5 and earlier for directory filtering
Jochen Tucht [Wed, 22 Jun 2005 21:35:50 +0000 (21:35 +0000)]
no message
Jochen Tucht [Wed, 22 Jun 2005 21:34:52 +0000 (21:34 +0000)]
PATCH: [
1215162 ] Merge7zInstaller update
Jochen Tucht [Wed, 22 Jun 2005 21:29:46 +0000 (21:29 +0000)]
Change recommended version of 7-Zip to 4.20; remove noise from Merge7z Nagbox
Jochen Tucht [Wed, 22 Jun 2005 21:21:11 +0000 (21:21 +0000)]
RFE: [
1205833 ] You can unzip more than just zip #1: Treat .ear and .war like .zip
Kimmo Varis [Wed, 22 Jun 2005 16:57:46 +0000 (16:57 +0000)]
PATCH: [
1225090 ] Fix bug that additional item gets selected in dircompare
Perry Rapp [Wed, 22 Jun 2005 02:40:08 +0000 (02:40 +0000)]
2005-06-22 Perry
Cosmetic: Fix grammar in comment (directory -> directories)
Src: FileFilterHelper.cpp
Kimmo Varis [Tue, 21 Jun 2005 17:34:10 +0000 (17:34 +0000)]
PATCH: [
1223754 ] Improve dircompare stats system
Kimmo Varis [Tue, 21 Jun 2005 13:53:39 +0000 (13:53 +0000)]
WinMerge experimental release 2.3.3.6 (cvs)
Kimmo Varis [Tue, 21 Jun 2005 13:49:06 +0000 (13:49 +0000)]
PATCH: [
1224249 ] Use constant for dirview special items