OSDN Git Service
Perry Rapp [Tue, 7 Feb 2006 18:39:21 +0000 (18:39 +0000)]
Current selftests status: Failure count: 0 (of 588)
Perry Rapp [Tue, 7 Feb 2006 18:28:28 +0000 (18:28 +0000)]
PATCH: [
1426371 ] Fix selftests for all builds
Fix argument parsing (broken by PATCH [
1425765 ] below)
Affected:
testdiff.pl
Kimmo Varis [Tue, 7 Feb 2006 17:57:50 +0000 (17:57 +0000)]
PATCH: [
1424535 ] Czech Translation, Submitted by Jan Hryz
- fix dir compare report dialog layout
Perry Rapp [Tue, 7 Feb 2006 03:03:13 +0000 (03:03 +0000)]
PATCH: [
1425770 ] Add some selftests with empty files
Affected:
testdiff.pl
New:
mixed: empty.txt empty_m.txt empty_u.txt empty_w.txt
Perry Rapp [Tue, 7 Feb 2006 02:31:46 +0000 (02:31 +0000)]
PATCH: [
1425765 ] Add optional build argument to testdiff.pl
Add build arguments so don't have to test all builds
Affected:
testdiff.pl
Perry Rapp [Mon, 6 Feb 2006 23:14:16 +0000 (23:14 +0000)]
PATCH: [
1392413 ] Track lossy encodings & warn user
Src/Languages/*: Merge*.rc
Perry Rapp [Mon, 6 Feb 2006 23:09:58 +0000 (23:09 +0000)]
PATCH: [
1392413 ] Track lossy encodings & warn user
Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
Src/Common: UniFile.cpp UniFile.h unicoder.cpp
Tim Gerundt [Mon, 6 Feb 2006 20:34:35 +0000 (20:34 +0000)]
PATCH: [
1424249 ] Add note about double-byte accelerators to l10n developer.ph
Perry Rapp [Mon, 6 Feb 2006 01:47:37 +0000 (01:47 +0000)]
Synchronizing Swedish translation to English where feasible.
Src/Languages/Swedish: MergeSwedish.rc
Perry Rapp [Mon, 6 Feb 2006 01:44:06 +0000 (01:44 +0000)]
Synchronizing Slovak translation to English where feasible.
Src/Languages/Slovak: MergeSlovak.rc
Perry Rapp [Sun, 5 Feb 2006 22:29:24 +0000 (22:29 +0000)]
PATCH: [
1414201 ] Cleanup Merge Line Flags
Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
MergeEditView.cpp MergeEditView.h
NEW Src: MergeLineFlags.h
Perry Rapp [Sun, 5 Feb 2006 22:18:05 +0000 (22:18 +0000)]
Add line filter so RCLocalization ignores codepages even if not ignoring numbers
Plugins\dlls: RCLocalizationHelper.ini RCLocalizationHelperU.ini
Plugins\src_VCPP\RCLocalizationHelper:
RCLocalizationHelper.ini RCLocalizationHelperU.ini
Perry Rapp [Sun, 5 Feb 2006 21:48:41 +0000 (21:48 +0000)]
Created branch "R_diffutils_branch"
Kimmo Varis [Sun, 5 Feb 2006 19:18:18 +0000 (19:18 +0000)]
PATCH: [
1424264 ] Use 'Item' instead of file in View-menu
Perry Rapp [Sun, 5 Feb 2006 18:23:26 +0000 (18:23 +0000)]
PATCH: [
1414904 ] updated italian translation for winmerge 2.5.3.1
Submitted by A. Decorte
New updates for selecting current diffs and wrap lines.
Src/Languages/Italian/MergeItalian.rc
Perry Rapp [Sun, 5 Feb 2006 18:18:41 +0000 (18:18 +0000)]
Fix Italian Edit/Options/Editor line selection controls.
Src/Languages/Italian/MergeItalian.rc
Kimmo Varis [Sun, 5 Feb 2006 15:56:36 +0000 (15:56 +0000)]
PATCH: [
1424535 ] Czech Translation
- submitted by Jan Hryz
Kimmo Varis [Sun, 5 Feb 2006 12:35:27 +0000 (12:35 +0000)]
BUG: [
1422257 ] Wrong text in tooltip
(Dutch translation had wrong shortcut keys in tooltip)
Perry Rapp [Sat, 4 Feb 2006 22:45:30 +0000 (22:45 +0000)]
PATCH: [
1423907 ] Fix diffutils hashing of \r
Src/diffutils: IO.C UTIL.C
Current selftests status: Failure count: 0 (of 480)
Perry Rapp [Sat, 4 Feb 2006 22:10:50 +0000 (22:10 +0000)]
PATCH: [
1414904 ] updated italian translation for winmerge 2.5.3.1
Submitted by A. Decorte
Src/Languages/Italian: MergeItalian.rc
Perry Rapp [Sat, 4 Feb 2006 21:49:36 +0000 (21:49 +0000)]
PATCH: [
1421199 ] Fix plugin menu for when location or diff detail view active
Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
Perry Rapp [Sat, 4 Feb 2006 21:33:37 +0000 (21:33 +0000)]
PATCH: [
1423461 ] Rearrange language select dialog
Revise patch applied earlier: put Ok on left and Cancel on right.
(Also fix French dialog which was left out before.)
Src: Merge.rc
Src/Languages: */Merge*.rc
Perry Rapp [Sat, 4 Feb 2006 18:07:22 +0000 (18:07 +0000)]
BUG: [
1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
(Wrap multimon def with ifndef
Src: MainFrm.cpp
Perry Rapp [Sat, 4 Feb 2006 17:47:11 +0000 (17:47 +0000)]
Undo PATCH: [
1424142 ] Wrap two lwdisp macros in ifndef
Src/Common: lwdisp.h
Perry Rapp [Sat, 4 Feb 2006 17:32:17 +0000 (17:32 +0000)]
PATCH: [
1424142 ] Wrap two lwdisp macros in ifndef
Src/Common: lwdisp.h
Perry Rapp [Fri, 3 Feb 2006 23:45:06 +0000 (23:45 +0000)]
PATCH: [
1409651 ] fix diffutils handling trailing whitespace
Src/diffutils/src: IO.C UTIL.C
Current selftests status: Failure count: 24 (of 480)
Failing -b t002 (u & m platforms, all 4 builds)
Failing -bi t002 (u & m platforms, all 4 builds)
Failing -b bug1406950 (u & m platforms, all 4 builds)
Perry Rapp [Fri, 3 Feb 2006 22:52:18 +0000 (22:52 +0000)]
PATCH: [
1423147 ] Fix lib links of cvs DisplayXMLFiles
Fix link lines
Bump version from 1.0.6.0 to 1.0.7.0.
Plugins\src_VCPP\DisplayXMLFiles:
DisplayXMLFiles.dsp DisplayXMLFiles.dsw DisplayXMLFiles.rc
Plugins\dlls:
DisplayXMLFiles.dll (v1.0.7.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.7.0
Perry Rapp [Fri, 3 Feb 2006 22:30:37 +0000 (22:30 +0000)]
PATCH: [
1423461 ] Rearrange language select dialog
Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
Src/Common: LanguageSelect.cpp LanguageSelect.h
Src/Languages: */Merge*.rc
Perry Rapp [Fri, 3 Feb 2006 02:43:13 +0000 (02:43 +0000)]
PATCH: [
1421694 ] Widen comments label in Rational ClearCase dialog
Src: Merge.rc
Src/Languages: */Merge*.rc
Perry Rapp [Fri, 3 Feb 2006 01:21:08 +0000 (01:21 +0000)]
Got left behind, was supposed to be part of PATCH: [
1412386 ] Adding readme files (2006-02-01 Perry)
Perry Rapp [Fri, 3 Feb 2006 00:31:13 +0000 (00:31 +0000)]
PATCH: [
1423060 ] Modify perl selftest to test all 4 builds
Perry Rapp [Fri, 3 Feb 2006 00:20:14 +0000 (00:20 +0000)]
PATCH: [
1423060 ] Modify perl selftest to test all 4 builds
Test all 4 builds (not just MergeUnicodeDebug).
Check up front that necessary programs exist: WinMerge(U).exe & diff2merge(U).exe.
Reprint failures at end if "noisy" option.
Affected:
testdiff.pl
Perry Rapp [Thu, 2 Feb 2006 01:57:00 +0000 (01:57 +0000)]
PATCH: [
1422052 ] Correction of Swedish for 2.5.3.1+
Contributed by Hans Eriksson
Src/Languages/Swedish: Merge Swedish
Perry Rapp [Wed, 1 Feb 2006 23:30:16 +0000 (23:30 +0000)]
PATCH: [
1412386 ] Adding readme files
New WinMerge/readme.txt
(Various other directories affected -- readme.txt & Changes.txt files)
Kimmo Varis [Wed, 1 Feb 2006 21:58:01 +0000 (21:58 +0000)]
PATCH: [
1419329 ] Select Line Difference
Perry Rapp [Wed, 1 Feb 2006 17:55:59 +0000 (17:55 +0000)]
Updating Polish dialog control layout to English (except where
would hinder appearance)
Src/Languages/*: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 17:43:15 +0000 (17:43 +0000)]
Cosmetic: synchronizing whitespace to English version
Src/Languages/*: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 17:38:05 +0000 (17:38 +0000)]
Cosmetic: synchronizing whitespace to English version
Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
Perry Rapp [Wed, 1 Feb 2006 14:57:20 +0000 (14:57 +0000)]
PATCH: [
1421018 ] Fix handle leak in GetOpenFileName
BUG: [
1418765 ] 2.4.4.0U maintain opened a handle on folders
Adds new method paths_GetWindowsDirectory & resets current
directory to WINDIR after GetOpenFileName call
Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
Perry Rapp [Wed, 1 Feb 2006 06:46:08 +0000 (06:46 +0000)]
PATCH: [
1419582 ] Polish translation update for latest v2.5
Contributed by dr_prozac
Src/Languages/Polish: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 05:21:55 +0000 (05:21 +0000)]
BUG: [
1419317 ] link error on 8-bit cvs trunk
Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
Src: Merge.dsp
Tim Gerundt [Tue, 31 Jan 2006 20:19:34 +0000 (20:19 +0000)]
PATCH: [
1418972 ] Web: Add version '2.5' to translation status
Tim Gerundt [Tue, 31 Jan 2006 19:31:58 +0000 (19:31 +0000)]
PATCH: [
1419171 ] Various Updates in German Translation for WinMerge 2.5
Kimmo Varis [Mon, 30 Jan 2006 18:20:52 +0000 (18:20 +0000)]
PATCH: [
1417858 ] Fix manual path
Perry Rapp [Mon, 30 Jan 2006 03:52:33 +0000 (03:52 +0000)]
PATCH: [
1415895 ] Split cmdline help string into chunks
Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
Src/Languages: */*.rc
Perry Rapp [Sat, 28 Jan 2006 11:23:12 +0000 (11:23 +0000)]
PATCH: [
1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
Src: DirView.cpp
Perry Rapp [Sat, 28 Jan 2006 11:19:44 +0000 (11:19 +0000)]
PATCH: [
1414196 ] Delete useless CChildFrame::OnNotify method
Src: ChildFrm.cpp ChildFrm.h
Perry Rapp [Sat, 28 Jan 2006 11:14:32 +0000 (11:14 +0000)]
PATCH: [
1414195 ] Delete two old TODO notes
Src: ChildFrm.cpp
Perry Rapp [Sat, 28 Jan 2006 10:56:53 +0000 (10:56 +0000)]
PATCH: [
1415165 ] Updated Swedish translation for 2.5.3.1+
Submitted by Hans Eriksson
Src\Languages\Swedish: MergeSwedish.rc
Perry Rapp [Sat, 28 Jan 2006 09:41:34 +0000 (09:41 +0000)]
2006-01-28 Perry
PATCH: [
1414904 ] updated italian translation for winmerge 2.5.3.1
submitted by A. Decorte
InnoSetup\Languages: Italian.isl
Tim Gerundt [Thu, 26 Jan 2006 23:20:26 +0000 (23:20 +0000)]
TODO: [
1413926 ] Build manual file(s) to /Build
Tim Gerundt [Thu, 26 Jan 2006 22:39:07 +0000 (22:39 +0000)]
PATCH: [
1414983 ] Manual: Make build path configurable (XSL)
Kimmo Varis [Thu, 26 Jan 2006 21:15:21 +0000 (21:15 +0000)]
PATCH: [
1413230 ] Use HtmlHelp API to open help
Perry Rapp [Wed, 25 Jan 2006 19:11:53 +0000 (19:11 +0000)]
BUG: [
1414868 ] Bug in byte_compare (early finish)
(Also added some comments.)
Src: DiffWrapper.cpp
Perry Rapp [Wed, 25 Jan 2006 02:36:40 +0000 (02:36 +0000)]
BUG: [
1412237 ] InitOption return value wrong if RegCreateKey fails
Fix unused wrong return value of InitOption & improve one comment
Src/Common: OptionsMgr.cpp
Kimmo Varis [Tue, 24 Jan 2006 18:55:47 +0000 (18:55 +0000)]
WinMerge experimental release 2.5.3.1 (cvs)
Kimmo Varis [Tue, 24 Jan 2006 18:52:40 +0000 (18:52 +0000)]
Bump revision number to 1.2.1
Kimmo Varis [Tue, 24 Jan 2006 18:32:34 +0000 (18:32 +0000)]
PATCH: [
1413909 ] Install HTMLHelp manual
Kimmo Varis [Mon, 23 Jan 2006 19:57:30 +0000 (19:57 +0000)]
PATCH: [
1411727 ] Merge inactive diff when cursor is inside it
Tim Gerundt [Mon, 23 Jan 2006 19:33:41 +0000 (19:33 +0000)]
BUG: [
1412395 ] Misspelling in l10n docs
Kimmo Varis [Mon, 23 Jan 2006 19:32:28 +0000 (19:32 +0000)]
PATCH: [
1406840 ] Use HTMLHelp locally
Kimmo Varis [Mon, 23 Jan 2006 18:48:56 +0000 (18:48 +0000)]
PATCH: [
1412405 ] Some edits to About & QuickStart pages of manual
- submitted by Perry
Perry Rapp [Mon, 23 Jan 2006 15:48:43 +0000 (15:48 +0000)]
Added "/ub" flag to WinMerge invocation, to stop polluting MRU (and added comments explaining arguments)
Perry Rapp [Mon, 23 Jan 2006 15:36:01 +0000 (15:36 +0000)]
Add repro files to selftests from
BUG [
1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
Current selftests status: Failure count: 9 (of 108)
Failing -b t002 (all 3 platforms)
Failing -bi t002 (all 3 platforms)
Failing -b bug1406950 (all 3 platforms)
PATCH: [
1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
Src: ByteComparator.cpp
(selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
Perry Rapp [Mon, 23 Jan 2006 15:26:21 +0000 (15:26 +0000)]
Added readme.txt, Changes.txt (this file).
Added noisy_testdiff.bat (so can easily double-click to get noisy version).
Added test files from BUG#
1406950.
u,m,w: bug1406950a.txt bug1406950b.txt
Perry Rapp [Mon, 23 Jan 2006 00:06:35 +0000 (00:06 +0000)]
PATCH: [
1405540 ] Cleanup filters dialog
Src: FileFiltersDlg.cpp FileFiltersDlg.h
Tim Gerundt [Sun, 22 Jan 2006 20:03:46 +0000 (20:03 +0000)]
PATCH: [
1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
Perry Rapp [Sun, 22 Jan 2006 19:54:13 +0000 (19:54 +0000)]
Annotate current selftests status
Perry Rapp [Sun, 22 Jan 2006 19:42:40 +0000 (19:42 +0000)]
2006-01-22 Perry
PATCH: [
1411406 ] self-tests and new arguments and new diff2winmerge.exe
Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
Src/Common: OptionsMgr.cpp OptionsMgr.h
New directory diff2winmerge:
Changes.txt ReadMe.txt Resource.h StdAfx.cpp StdAfx.h diff2winmerge.cpp
diff2winmerge.dsp diff2winmerge.h diff2winmerge.rc
New directory selftests:
testdiff.pl
subdir m:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txt t003b.txt
t004a.txt t004b.txt
subdir u:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txt t003b.txt
t004a.txt t004b.txt
subdir w:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txtt003b.txt
t004a.txt t004b.txt
Kimmo Varis [Sat, 21 Jan 2006 14:52:27 +0000 (14:52 +0000)]
PATCH: [
1411150 ] Add GetActiveMergeView for MergeDoc
Perry Rapp [Sat, 21 Jan 2006 00:56:38 +0000 (00:56 +0000)]
One final update to Polish translation (less than 3 seconds string)
Perry Rapp [Sat, 21 Jan 2006 00:43:41 +0000 (00:43 +0000)]
2006-01-21 Perry
PATCH: [
1407740 ] Polish translation update (for version 2.4.4.0)
Submitted by dr_prozac
(Perry merging many of these to cvs trunk)
Src/Language/Polish: MergePolish.rc
Kimmo Varis [Fri, 20 Jan 2006 18:27:15 +0000 (18:27 +0000)]
BUG: [
1408587 ] Unused DoScroll() function in Merge*View
- remove DoScroll() from CMergeEditView and CMergeDiffDetailView
Kimmo Varis [Tue, 17 Jan 2006 21:10:37 +0000 (21:10 +0000)]
PATCH: [
1406207 ] Fix error message for unique folders
Kimmo Varis [Tue, 17 Jan 2006 20:47:09 +0000 (20:47 +0000)]
PATCH: [
1407555 ] Manual: add new shortcuts for find
Tim Gerundt [Tue, 17 Jan 2006 20:27:02 +0000 (20:27 +0000)]
PATCH: [
1405261 ] Manual: Background colors for Notes and Co. (XSL)
Tim Gerundt [Tue, 17 Jan 2006 20:25:08 +0000 (20:25 +0000)]
PATCH: [
1405344 ] Manual: New icons
Tim Gerundt [Tue, 17 Jan 2006 19:56:55 +0000 (19:56 +0000)]
PATCH: [
1405344 ] Manual: New icons
Perry Rapp [Tue, 17 Jan 2006 04:31:41 +0000 (04:31 +0000)]
PATCH: [
1401711 ] A hybrid of word diff and char diff
Submitted by Takashi Sawanaka
Src: MergeDocLineDiffs.cpp PropEditor.cpp
stringdiffs.cpp stringdiffs.h
Kimmo Varis [Mon, 16 Jan 2006 21:41:48 +0000 (21:41 +0000)]
PATCH: [
1406203 ] Open unique files to external editor
Perry Rapp [Sun, 15 Jan 2006 18:06:20 +0000 (18:06 +0000)]
PATCH: [
1333600 ] Get rid of global MainFrame pointer (part1)
Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
OpenDlg.cpp PropRegistry.cpp
Src\Common: PreferencesDlg.cpp
Perry Rapp [Sat, 14 Jan 2006 22:04:26 +0000 (22:04 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Remove limitation (file filters now handle unicode files)
(reverses my PATCH: [
1401001 ])
Manual: Filters.xml
Perry Rapp [Sat, 14 Jan 2006 21:58:51 +0000 (21:58 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Src: FileFilterMgr.cpp
Kimmo Varis [Sat, 14 Jan 2006 16:57:47 +0000 (16:57 +0000)]
PATCH: [
1405340 ] Add XP shadow to folderskip.ico
- submitted by Tim
Kimmo Varis [Sat, 14 Jan 2006 14:09:12 +0000 (14:09 +0000)]
PATCH: [
1385672 ] Replace some 'file's with 'item's
Kimmo Varis [Sat, 14 Jan 2006 13:29:56 +0000 (13:29 +0000)]
PATCH: [
1372044 ] Add FileActionScript for folder compare actions
Perry Rapp [Sat, 14 Jan 2006 04:00:24 +0000 (04:00 +0000)]
TODO: [
1395638 ] CChildFrame::PreCreateWindow() does nothing
Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
Tim Gerundt [Fri, 13 Jan 2006 21:59:06 +0000 (21:59 +0000)]
PATCH: [
1404317 ] Web: Known Limitations page
Perry Rapp [Fri, 13 Jan 2006 17:49:54 +0000 (17:49 +0000)]
PATCH: [
1403893 ] Fix whitespace error in ByteCompare
BUG: [
1400779 ] Whitespace bug in ByteComparator
Src: ByteComparator.cpp
Perry Rapp [Fri, 13 Jan 2006 17:46:06 +0000 (17:46 +0000)]
PATCH: [
1403454 ] Add comment to UniStdioFile.h
(Cosmetic)
Src/Common: UniFile.h
Kimmo Varis [Fri, 13 Jan 2006 16:27:40 +0000 (16:27 +0000)]
PATCH: [
1039677 ] Alter text of Reset button label
Kimmo Varis [Fri, 13 Jan 2006 16:04:50 +0000 (16:04 +0000)]
PATCH: [
1399263 ] Captioned panes (new style) - apply to languages
Kimmo Varis [Thu, 12 Jan 2006 21:14:08 +0000 (21:14 +0000)]
PATCH: [
1399738 ] Filename bars to use caption colors
Kimmo Varis [Thu, 12 Jan 2006 18:29:22 +0000 (18:29 +0000)]
PATCH: [
1399263 ] Captioned panes (new style)
Tim Gerundt [Thu, 12 Jan 2006 17:04:38 +0000 (17:04 +0000)]
PATCH: [
1403412 ] German: Option 'Line Difference Coloring' looks broken
Tim Gerundt [Wed, 11 Jan 2006 22:11:52 +0000 (22:11 +0000)]
PATCH: [
1402858 ] Web: New background color for 'important' and 'note'
Kimmo Varis [Wed, 11 Jan 2006 17:48:30 +0000 (17:48 +0000)]
WinMerge beta release 2.5.2
Kimmo Varis [Wed, 11 Jan 2006 17:42:56 +0000 (17:42 +0000)]
PATCH: [
1401001 ] Add note to filters manual that Unicode is not supported
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:32:53 +0000 (17:32 +0000)]
PATCH: [
1382020 ] New FAQ entry for large file Quick Compare
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:27:45 +0000 (17:27 +0000)]
Fix EOL type back to DOS - last commit changed it to UNIX by accident.