Release Notes for P4WinMerge, the Perforce Windows Merge Program Release 2007.3 Dec 02, 2007 Introduction This document lists all user-visible changes to P4WinMerge between releases 2001.1 and 2007.3. To display the version of P4WinMerge you're using, use the "About" command in the Help menu. Release notes for all Perforce products can be found under "Release Notes" at http://www.perforce.com/perforce/technical.html. Perforce numbers releases YYYY.R/CCCCC, for example, 2002.1/30547. YYYY is the year; R is the release of that year; CCCCC is the bug fix change level. Each bug fix in these release notes is marked by its change number. Any build includes (1) all bug fixes of all previous releases and (2) all bug fixes of the current release up to the bug fix change level. -------------------------------------------------------------------------- New Functionality in 2007.3 None. Bugs Fixed in 2007.3 None. -------------------------------------------------------------------------- New Functionality in 2007.2 None. Bugs Fixed in 2007.2 None. -------------------------------------------------------------------------- New Functionality in 2006.2 None. Bugs Fixed in 2006.2 None. -------------------------------------------------------------------------- New Functionality in 2006.1 None. Bugs Fixed in 2006.1 None. -------------------------------------------------------------------------- New Functionality in 2005.2 None. Bugs Fixed in 2005.2 None. -------------------------------------------------------------------------- New Functionality in 2005.1 None. Bugs Fixed in 2005.1 None. -------------------------------------------------------------------------- New Functionality in 2004.2 #52107 The Help > About dialog now has a context menu for ease of copying the information using just the mouse. (Job #12993 - SIR) Bugs Fixed in 2004.2 None. -------------------------------------------------------------------------- New Functionality in 2003.2 #51764 P4WinMerge can now handle line up to 6000 characters long. (Job #12972 - SIR) #47109 Line endings differences are ignored when P4WinMerge does its comparisons. (Job #4664 - SIR) Bugs Fixed in 2003.2 #51763 The Delete and Backspace keys now work properly on last character in a line in P4WinMerge. (Job #12977) #51656 P4WinMrg no longer assumes that the last character of a file is a newline. This enables you to now use the mouse to mark the entire last line of a file, even if the file does not end with a newline. (Job #12900 - Bug) #51626 P4WinMerge no longer crashes if you select all the characters in a conflioct block and delete them by pressing the Del key. It now simply deletes the block, as expected. (Job #12899 - Bug) #51246 The Help button in the initial dialog for P4WinMerge now works correctly. (Job #12801 - Bug) -------------------------------------------------------------------------- New Functionality in 2003.1 #43558 P4WinMerge has a new look and feel, including new icons and new colors. P4WinMerge uses 32-bit icons if possible. There is a new registry setting: P4WinMrg/Options/Use256colorIcons If it is set, it forces use of 256 (really 16) color icons. #43307 The Toolbar button (the penguin) to toggle the line ending style has been replaced with a less cryptic combobox. (No Job) #39700 P4WinMerge now accepts either / or - as the flag for command line switches. (No Job) #39687 If p4winmerge is run with a /? or a -? as the first argument, a dialog appears which explains the various command line options. (Job #10103 - SIR) Bugs Fixed in 2003.1 #52127 P4WinMege is now smarter about positioning the caret when doing a Delete. It should no longer get confused and delete the wrong character(s) nor split a doublebyte character. (Job #11395, #12802 - Bug) #43247 The colors used in the content blocks for the Merged pane are now the same shade as the colors used in the Theirs/Yours panes. (Job #10915 - Bug) -------------------------------------------------------------------------- Major New Functionality in 2002.2 #36998 P4WinMerge's help is now HTML based. (Job #9455 - SIR) #36370 P4WinMerge now uses Win XP visual styles when running on XP. (Job 9165) #32349 Added support for -b and -w command line flags to p4winmerge. -b means ignore white space differences -w means ignore all white space Added P4WinMerge startup dialog box support for the -b and -w command line switches. Added 3 menu items to the P4WinMerge Options menu that allow you to change the treatment of white space after P4WinMerge has merged your files. The 3 choices are the usual: White space included in diffs, Ignore white space diffs, Ignore white space. However to change from one to another, the current merge file must be discarded and a new one created. This means ALL of your changes will be discarded whenever you switch white space treatment after P4WinMerge comes up. You will be warned via a dialog box that this is going to happen! (Job #7798) #37886 P4WinMerge has a flat looking splitter to go with the new P4Win look. (Job #9251 - SIR) Bugs Fixed in 2002.2 #37870 P4WinMerge now correctly calculates the length of the longest line among the 3 files being merged. (Job #9676 - Bug) #33780 Use Create rather than Open to open registry key when saving settings. Open fails if the key doesn't exist, such as the first time the app is run. (Job #8200 - Bug) #32864 When inserting a control character, such as a TAB, don't attempt to handle it like a multi-byte character - just insert it. (Job #7929, #7930 - Bug) #27585 In P4WinMerge, if text is selected and the BackSpace key is pressed, just perform a Delete. Previously it was doing a backspace in addition to the delete. (Job #6685 - Bug) #25434 Get the default font name from the resource file; if necessary, query the merge pane for font info before creating the Change Font dialog box. (Job #6284, #6332, #6336 - Bug) #23883y Fixed handling of MRU filenames in registry.y (Job #5876 - Bug) y #23333y If not showing removed lines in the merged pane,y calculate the location of the "visible indicator" in the diffy locator using the "theirs" pane dimensions since the actual values in the merged pane do not correspond to the saved values. (Job #5651 - Bug) #23298 Don't throw away characters > 0x7F when they are entered. (Job #5694 - Bug) #22727 If a block is marked as conflicting, don't accidentally later mark it as not having a conflict. (Job #5576 - Bug) -------------------------------------------------------------------------- New Functionality in 2002.1 #29539 If one or more of the filenames provided to P4WinMerge cannot be found, display a message box with all the missing filenames, then bring the files dialog box up again so you can retry entering the filenames. (Job #5591, #7210 - SIR) #29087 Added a Line Endings icon to the p4winmrg tool bar. (Job #6954 - SIR) #23884 Added an accelerator for select all (Ctrl+A). (Job #5689 - SIR) #23414 Added Perforce web site and email menu items to Help. (Job #3186 - SIR) #22273 Honor new LineEnd client field when called from P4Win. (Job #3622 - SIR) Bugs Fixed in 2002.1 #33780 Use Create rather than Open to open registry key when saving settings. Open fails if the key doesn't exist, such as the first time the app is run. (Job #8200 - Bug) #32864 When inserting a control character, such as a TAB, don't attempt to handle it like a multi-byte character - just insert it. (Job #7929, #7930 - Bug) #27585 In p4winmrg, if text is selected and the BackSpace key is pressed, just perform a Delete. Previously it was doing a backspace in addition to the delete. (Job #6685 - Bug) #25434 Get the default font name from the resource file; if necessary, query the merge-pane for font info before creating the Change Font dialog box. (Job #6284, #6332, #6336 - Bug) #23883 Fixed handling of MRU filenames in registry. (Job #5876 - Bug) #23333 If not showing removed lines in the merged pane, calculate the location of the "visible indicator" in the diff locator using the "theirs" pane dimensions since the actual values in the merged pane do not correspond to the saved values. (Job #5651 - Bug) #23298 Don't throw away characters > 0x7F when they are entered. (Job #5694 - Bug) #22727 If a block is marked as conflicting, don't accidentally later mark it as not having a conflict. (Job #5576 - Bug) -------------------------------------------------------------------------- New Functionality in 2001.2 #23884 Added accelerator for select all (Ctrl+A). (Job #5689 - SIR) #23414 Add Perforce web site and email menu items to Help. (Job #3186 - SIR) Bug Fixes in 2001.2 #25434 Get the default fontname from the resource file; if necessary, query the merge-pane for font info before creating the Change Font dialog box. (Job #6284, #6332, #6336 - Bug) #23883 Fixed handling of MRU filenames in registry. (Job #5876 - Bug) -------------------------------------------------------------------------- New Functionality in 2001.1 #22273 Updated P4WinMrg to honor new LineEnd client field when called from P4Win. (Job #3622 - SIR) Bugs Fixed in 2001.1 #23333 If not showing removed lines in the merged pane of p4winmrg, calculate the location of the "visible indicator" in the diff locator using the "theirs" pane dimensions since the actual values in the merged pane do not correspond to the saved values. (Job #5651 - Bug) #23298 Don't throw away characters > 0x7F when they are entered. (Job #5694 - Bug) #22727 If a block is marked as conflicting, don't accidentally later mark it as not having a conflict. (Job #5576 - Bug)