April 13th, 2012· Fixed bug n°223 and 448: tooltips might stop showing randomly
April 4th, 2012· Fixes a few bugs.
January 9th, 2012· Fixed bug n°437: folder diff viewer might show wrong type of object for 'special' file systems objects (links, devices...) considering them as folders
· Fixed bug n°438: when failing to encode text files content appropriately when saving to FTP, ECMerge might stop working
· Fixed bug n°439: when FTP authentication fails while loading a binary file, the view might be loaded incorrectly
· Fixed bug n°440: default field in status bar should always be left aligned
· Fixed bug n°441: status bar reports that the image cannot be scrolled but it is scrolled correctly
· Fixed bug n°442: Save and solve works correctly but the user interface does not report it appropriately in folder view
November 21st, 2011Bug fixes:
· Fixed bug n°424: when folders are not supported by protocol handler (simple HTTP), filtering does not work
· Fixed bug n°428: resolving should not be blocked by a missing source
· Fixed bug n°429: read_number function with on offset out of range might crash for a file in memory
· Fixed bug n°432: searching inside differences might crash for text and binary views
· Fixed bug n°433: when missing source folder is created as the result of output operations, result is OK but UI fails to show it
· Fixed bug n°434: when a match is found, binary diff fails to resynchronize correctly other views
ActiveX:
· It is now possible to gain access to a Document object created inside ECMerge scripting engine (as a FHAxMergeDocument object), as well as a SourceDescription (as a FHAxMergeSource object)
· It is now possible to set options which expects a SourceDescription directly from the options() member. Use an FHAxMergeSource to do so.
October 6th, 2011· Fixed bug n°415: when copying small files, progression might not be reported correctly
· Fixed bug n°416: on Mac OS X, the cursor might not show in binary views
· Fixed bug n°417: comparison of archives as binary might trigger decompression
· Fixed bug n°418: Could not generate reports in text format for Polish
· Fixed bug n°419: when opening a ZIP as a folder comparison from another folder comparison, the ZIP might be uncompressed several times
· Fixed bug n°420: on Windows Vista and 7, shell extension might work only during the session of installation and stop working when logging again
· Fixed bug n°422: small glitches when drawing collapsed region exactly aligned with display lines
· Fixed bug n°423: Cursor might not show at first position in second column of binary views
September 30th, 2011General:
· Toolbars icons now available in small and large size
· Most text or combo fields with available validity tests are now automatically colored in red when they do not comply (e.g. regular expressions, patterns...)
· Changed the name of executable on Windows to "ecmerge.exe" and "ecmerge-cli.exe", so that "ecmerge" name is used as well on Windows as on Unixes
· Improved ECMerge icon for high resolutions on Windows and Mac OS X
Text Edition and Merging:
· Improved find/replace function to avoid cycling in the document
· Added many default file types to ignore easily comments (ADA, Bash, Batch, C/C++, COBOL, ColdFusion, Delphi, HTML, INI, InnoSetup, PO, PHP, SmallTalk, SQL...)
Binary Comparisons:
· Ellié Computing Merge now displays binary documents and comparisons
· Define specific binary file types based on file name patterns, in which you will be able to specify static or dynamic fields to ignore (timestamps, random blocks, comments initialized by production software...)
· Generate accurate comparison statistics on Binary Comparisons
Bug fixes:
· Fixed bug n°387: truncated icon labels
· Fixed bug n°390: FTP failed login might query repetitively for user/pwd
· Fixed bug n°392: ‘open’ menu item in Launcher would not always work
· Fixed bug n°396: equality test and file copy could be slow on local network with high lag.
· Fixed bug n°401: progression could go mad with copy larger than 4GB
· Fixed bug n°412: crash when using empty filter inside lines AND checking "use lines filter to ignore"
July 4th, 2011· General - Fixed bug n°383: a crash report is displayed when trying to open the missing file for a named session
· Documentation - Help system now supports search highlighting: whenever a keyword is searched in the help file, the occurrences are highlighted in the presented page (with a yellow background).
February 17th, 2011General:
· Fixed bug n°380/381 with trial, during first execution some features may not work as expected
· Improved Xtract trial when testing comparison of Microsoft Word, RTF or Open Office text documents
· Documented --open-conflict command line switch
Images and Binaries:
· Improvement: return code can now be used in combination with diff2/diff3 mode to determine if files are different in quiet mode
Texts:
· Fixed bug n°374/375: ignoring signle lines and lines covered by a regular expression could interfer
January 21st, 2011· Fixed few translations
December 1st, 2010· Fixed bug n°370: crash in filters/file types options panel
· Fixed bug n°371: spurious box sometime showing in --lockedui mode
· Fixed bug n°372: Windows Shell Extension would not always show on 64 bits OS
November 10th, 2010· Fixes several bugs and now defines a fixed pitch font as the default.
October 21st, 2010General:
· Fixed bug n°360: crash may happen after combination of wokrspace renaming and removals
· Fixed bug n°361: removing currently selected workspace might not behave as expected
· Folders - Fixed bug n°357: mirroring generic copy action might not remove completely folders with content
· Fixed bug n°356: fixed script generated in $(HOME)/bin which might not always work as expected
October 6th, 2010General:
· The menus were reorganized to be more rational and make actions easier to find
· The Launcher now have a Site section in which you can store the settings for your FTP and SCC sites
· A problem submitter box was added which let you submit a ticket in our support ticket interface easily
· The status bar now displays the colours legend together with the statistics
· Files types and converters which are hidden by the pattern of other file types and converters are displayed in red in the list, so that you immediately see that they are not activated, the hiding patterns are displayed in blue.
· The integration with the file explorer is now present on Linux (Nautilus, Konqueror, Thunar) and Mac OS X (Finder + Service Menu for Snow Leopard) in addition to Windows.
· A new Open Conflict File menu item let you open conflict files generated by CVS, SVN, Perforce, Git, Mercurial, Bazaar and ECMerge itself. It allows you to solve those conflicts easily, from the contextual menu of the file explorer of your system as well as from within ECMerge.
· The Windows 95, 98, Me, Nt and 2000 platforms are not supported any more.
Reports:
· A button is available in HTML and XML export dialog box to reach immediately Reports option in the session.
· Added a button to browse for the CSS
Folders:
· When "Scan sub-folders" button is depressed, collapsing folders unschedules comparison. It lets you "pause" comparison for those folders.
Images:
· Two modal buttons were added in the toolbar, you can choose between "Move image on screen" and "Change images alignment"
· The differentiation mode called "Blank similar" was renamed "Mask similarities"
· Support for loading TGA files
July 12th, 2010General:
· Fixed bug n°338: cannot find } characters in normal text
· Fixed bug n°339: in folders replacing with $1.ext does not work
· Fixed bug n°342: renaming a folder might makes it appear empty, as if deleted
· Fixed bug n°348/350: logs might get partially lost when a great quantity of logs are output at once
· Fixed bug n°351: status bar field not always cleaned correctly
· Fixed bug n°352: in image diffs, panel should not be draggable
Script:
· Added ability to set default text colour in OptionsSet (display.unchanged_text_fgcolor)
· Fixed bug n°346: FolderDocument.Item ignore member does not work as documented
July 12th, 2010· Added documentation about how to use --sip (in particular on Windows)
· Fixed bug n°324: when ECMerge is run with a script it should not load default desktop
· Fixed bug n°328: javascript documentation
· Fixed bug n°329: launcher shown when ECMerge started in "locked-ui" mode
· Fixed bug n°330: on file new diff, button to open "something" always opens a file by default, even for a folder diff
· Fixed bug n°331: the copy option set button does not change copied optionset unique id
· Fixed bug n°332: when loading problems happen, is_in_fully_resolved_state might still return true
· Fixed bug n°333: cannot save inclusive merge in GUI
· Fixed bug n°336: if a (XML derived) report for Text or CSV is output to clipboard, it appears as Chinese chatacters
March 19th, 2010SCC listings:
· Fixed bugs about SubVersion, CVS, Perforce, Mercurial
· Added Darcs, GIT and Bazaar plugins. Darcs 2.4 is required, GIT 1.7 is required
Text:
· Added merge in-line left then right and right then left, which let you merge at word or character level and select those combinations of text when a conflict occurs
· Added the ability to parameter the markers to be used when using inclusive merge (line and in-line), inclusing their presence and their content.
· More comparison parameters are now available from the scripting (including typed.text.comparison.match_... serie)
· Fixed bug n°319: potential crash when applying patches on text files
Images:
· Fixed bug n°321: image file types may not be well open when certain auto-selection conditions happened
· ECMerge tested to compare Adobe DNG files as thumbnails, with the addition of the DNG File type.
Folders:
· Fixed bug 314: file names with same symbols were not always associated because of different normalization form of Unicode
· Fixed bug 315: cancelling when pressing Star (*) key to expand all folders would not terminate rapidly
Xtract:
· Fixed bug 318: Xtract crash on certain Word DOC files generated by Office 2010
Scripting:
· Fixed bugs 305-307/309/320-322
· Added System.Threading.Thread.sleep (milliseconds), System.Console.beep ( )
FTP:
· Added more robust filtering of bad entries returned by servers to support TypSoft FTP Server
January 29th, 2010· Fixes several bugs, related to Mac OS X, patch application and source code control browsing.
January 8th, 2010General:
· Fixed bugs 274 to 281 and bugs 283 to 286
· Fixed documentation about how to ignore lines in files
Folders:
· Added right click macro action "Touch" which set last modification date of all selected files and folders contents to now
· Added right click macro action "Set dates" which let you set last modification, last access and creation date to a specified value, for selected files
Scripting:
· Added function to manipulate file dates from the scripting (VFS.set_dates) as well as attributes (VFS.attrib). VFS.attrib handles Windows attributes as well as traditional Unix modes (as would a chmod command)
· Added function VFS.stat which returns metadata for a file or directory (a more efficient equivalent to VFS.dir with the filename specified as filter)
· All the dates are now reflected inside VFS.Metadata structures, you can thus read and use those dates from scripting
Text:
· Added the ability to ignore portions of lines when comparing at line level, the portions of lines can be expressed as set of columns with descriptions such as "1-20;55-" or through regular expressions, in that case you can exclude text matched (or not matched) by the entire expression or sub-expressions.
· Undoing pretty-printing actions generating thousands of lines is now instant
December 14th, 2009· Fixes several bugs, in particular on Mac OS X, it converts the non-recursive listing mode into a mask of exclusion of sub-folders.
November 26th, 2009· Fixes several bugs about command line, scripting, translations, potential freeze and other parts of the application.
November 9th, 2009· Fixes various bugs.
· Adds minor features and replaces the evaluation with serial number with an automatic system limiting evaluation to 30 usage days.
July 7th, 2009· Fixes a bug in Xtract and adds a user provided Brazilian translation.
June 1st, 2009Folders:
· Generic copy and Write merge result dialogs now have an "Auto-run unless Shift is pressed" choice, reducing the number of interactions to get your copies and merges done.
· Fixed bug n°242: after a comparison failure, copying over or removing a file did not reset error state for that item.
Mac OS X:
· Fixed bugs n°235-237, 240-241, improving greatly usability.
Unixes (Linux / Solaris):
· Added File browser preference to specify which browser to launch to view folders (Nautilus and Konqueror are auto-detected).
· ECMerge can now be installed anywhere, you do not need root privilege anymore.
April 13th, 2009· Fixes several bugs.
· Improves on simplicity and the converter Xtract now supports ZIP files withouth third party applications.
March 23rd, 2009· Fixes several bugs, and the text converter Xtract now supports DOC files (from Word 6 to 2007) in addition to RTF and other file formats.
March 3rd, 2009General:
· Fixes bug 219 to 222 and 224 to 226
Converters:
· Added Rich Text Format (RTF) to text conversion to Xtract. The RTF extractor understands code page commands and works with Windows, Mac for Western as well as Eastern languages (Japanese, Korean, Chinese...)
· Xtract now its own serial number handling and obfuscate a little its output in Limited Demo, Xtract can be licenced separately from ECMerge.
· Added simple converter for Microsoft Excel to CSV (runs on Windows only with Excel installed)
Scripting:
· Added support for the 'Document.information' member, giving access to detected file types, languages... letting scripts handle files in function of this information.
· Added Folder Easy Synchronization macro-command (two arrows button), which let you set easily options for comparison and mirroring left to right and vice versa)
Folders:
· Simplified 'Hide conflicting items' behaviour: resolved items would be considered is 'initially conflicting' thus placed in the category. Though you can force identical item to be 'resolved', thus modifying their hidden status. Now, the Hide 'identical/different/conflicting' items rule depends only on comparison status, not any more on resolution status
February 2nd, 2009· Introduces several new features, from which the Launcher, automatic session, shared options, file types, a text converter for DOCX/SXW/ODT and numerous improvements.
· This version fixes many bugs as well.
January 13th, 2009· Launcher.
· Automatic session.
· Shared options.
· File types.
· Text converter for DOCX/SXW/ODT and numerous improvements.
· Fixes several bugs as well.
December 12th, 2008· File types with extensions matching, converters.
· Options sharing, import/export of file types and converters.
· New Launcher (easily launch again sessions, workspaces...).
· Integration of scripting to contextual menu.
· Command line even more complete to allow perfect integration as a differ/merger in SCC.
December 5th, 2008General:
· Fixed bug n°182: error in documentation (misleading indication about --mode=merge3).
· Fixed bug n°183: swap to 3-way after opening a 2-way ECMT crashes.
· Fixed bug n°187: error message still truncated in some conditions.
Folders:
· Fixed bug n°186: bug in comparison scheduling order gives (very) deceptive time evaluation, while comparison time is not altered itself.
Source code control plugin:
· Fixed bug n°185: presence of non ASCII characters in path could prevent auto-checkout feature.
Unix based OSs (Linux, Mac, Solaris):
· Fixed bug n°184: listing directories with broken symbolic links fails with error File not found.