Commit graph

22 commits

Author SHA1 Message Date
wiz
b121d7b7b2 Update to 3.12.0, based on meld-devel with an update. Changes to meld-devel:
2014-09-27 meld 3.12.0
======================

  Fixes:

   * Ignore missing files when cleaning up our recently-used folder (Kai
     Willadsen)
   * Guard against dialogs missing properties they should definitely have (Kai
     Willadsen)
   * Remove old property from patch dialog (Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)


2014-09-19 meld 3.11.4
======================

  Fixes:

   * Only apply the auto merge flag to the last comparison started (Kai
     Willadsen)
   * Fix install layout issues on Debian-based systems (Kai Willadsen)
   * Fix "Open External" for files on Windows (Kai Willadsen)
   * Record installation directory and executable location on Windows (Kai
     Willadsen)
   * Revert to using latin1 as a fallback encoding; this will be reverted in
     the next unstable series (Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Daniel Mustieles (es)
   * fr33domlover (he)
   * Jiri Grönroos (fi)
   * Josef Andersson (sv)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)
2014-10-01 09:43:43 +00:00
wiz
43d0e67d75 Update to 1.8.3:
2013-12-15 meld 1.8.3
=====================

  Fixes:

    * Fix subdirectory comparisons for Subversion 1.6 (Ben Ross)
    * Fix git status parsing for some statuses (Tom Scytale)
    * Don't disable updating when syncpoints aren't yet active (Kai Willadsen)
    * Fix modifying column properties causing crashes when using .ini config
      backend (Kai Willadsen)

  Translations:

    * Andika Triwidada (id)
    * Milo Casagrande (it)
    * zodiac111 (zh_CN)
2013-12-31 18:03:51 +00:00
wiz
0683901d3e Update to 1.8.1:
2013-9-22 meld 1.8.1
====================

  Fixes:

    * Add AppData file (Kai Willadsen)
    * Change order of version control selection for CVS and old SVN (Kai
      Willadsen)
    * Fix escaped markup in folder comparisons (Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Enrico Nicoletto (pt_BR)
    * Gabor Kelemen (hu)
    * Marek Černocký (cs)
    * Milo Casagrande (it)
    * Piotr Drąg (pl)
2013-09-30 18:23:21 +00:00
wiz
b73e42b207 Update to 1.7.4:
2013-7-28 meld 1.7.4
====================

  Features:

    * Commit dialog can now automatically wrap commit messages (Kai Willadsen)
    * Add Bazaar support for pushing changes, and improve sensitivity setting
      (Louis des Landes)
    * Support Subversion 1.8 (Yuri)
    * Type-ahead-find search now works in folder comparisons (Kai Willadsen)
    * Preference to swap pane order left = local (Kai Willadsen)

    * Arch, Codeville and RCS are no longer supported (Kai Willadsen)

  Fixes:

    * When opening new tabs from the command line, bring new tab to the front
      (Richard Simmons)
    * Current chunk highlight is now customisable using gtkrc (Louis des
      Landes)
    * Syncpoints now prevent chunks from being re-merged, syncpoints move with
      insertions, and disable automatic updating (Kai Willadsen)
    * Various version control updates and fixes (Louis des Landes, Kai
      Willadsen)
    * Sensitivity fixes (Kai Willadsen)
    * Translation string fixes (Marek Černocký)

  Translations:
    * Daniel Mustieles (es)
    * Dimitris Spingos (el)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Piotr Drąg (pl)
2013-07-28 09:23:20 +00:00
wiz
da4f3af2ae Update to 1.7.3:
2013-5-4 meld 1.7.3
====================

  Features:

    * Support launching conflict comparisons from Subversion (Louis des
      Landes)
    * The external text editor setting now supports opening files at a
      particular line number (Konstantin Starojitski)

    * A host of minor improvements to the version control UI, including:
      * Add a new Push action for VC modules, currently supported in Git (Kai
        Willadsen)
      * Show a summary of unpushed commits, currently supported in Git (Kai
        Willadsen)
      * Reworked commit dialog, including more details about files to be
        committed and more useful previous-log selection (Kai Willadsen)
      * Console output for VC comparisons is now formatted to better
        distinguish commands, output and errors (Kai Willadsen)
      * Support better sensitivity handling in VC comparisons, currently
        implemented by Git (Kai Willadsen)

    * Sundry minor UI improvements:
      * Much HIG-ification and better wording for actions, dialogs and
        labels (Kai Willadsen, with diligent bug reporting from Adam Dingle)
      * Make columns user-resizable in version control and folder comparisons
        (Kai Willadsen)
      * There is now a Save All action, to save all modified files in the
        current comparison (Kai Willadsen)
      * Rather than giving up on long inline-highlighting comparisons, Meld
        now prompts to continue the comparison (Kai Willadsen)
      * F5 is now a additional shortcut for Refresh (Kai Willadsen)
      * Reload has been renamed to Revert and its UI has been improved for
        file comparisons (Kai Willadsen)

  Fixes:

    * Version control updates and miscellaneous fixes (Dominique Leuenberger,
      Louis des Landes, Timothy Babych, Kai Willadsen)
    * When guessing file types for syntax highlighting, we now use file
      contents as well as extension (Kai Willadsen)
    * Prev/Next Change navigation now centres changes slightly more
      aggressively (Kai Willadsen)

  Translations:
    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Inaki Larranaga Murgoitio (eu)
    * Jiro Matsuzawa (ja)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl)
    * Matej Urbančič (sl)
    * Pere Orga (ca)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)
    * Мирослав Николић (sr, sr@latin)
2013-06-04 18:51:59 +00:00
wiz
03e6109881 Update to 1.7.2:
2013-4-16 meld 1.7.2
====================

  Features:

    * In version control view, conflicts now open in a three-way merge mode
      for Bazaar and Git, with other VCs to follow (Louis des Landes)
    * Manual synchronisation of split points for comparisons (Piotr Piastucki,
      Kai Willadsen)
    * The "Ignore blank lines" setting is now used in folder comparisons, in
      same manner as text filters (Kai Willadsen)

  Fixes:

    * Many minor Windows compatibility fixes (Vincent Legoll, Robert Wahler,
      Kai Willadsen)
    * Version control compatibility updates and fixes (Manuel Siggen, Kai
      Willadsen)
    * Better handling of Unicode filenames (Kai Willadsen)
    * Better support for cross-platform newline behaviour, particularly on
      Windows (Kai Willadsen)
    * Sensitivity fixes for file and folder comparisons (Kai Willadsen)
    * Build and installation fixes (Kalev Lember, Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl).
    * Matej Urbančič (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)
2013-04-21 14:46:34 +00:00
wiz
5bdca21ee8 Update to 1.7.1:
2012-2-28 meld 1.7.1
====================

  Features:

    * Folder comparisons can now show extra information, such as file size and
      modification times. Column visibility and ordering are properly
      configurable. (Philipp Müller, Kai Willadsen)
    * Shallow comparison (i.e., based on size and timestamp) are now supported
      for folder comparisons, including timestamp resolution preferences for
      cross-filesystem comparisons. (Cristian Dinu)
    * The UI for launching new comparisons has been reworked to have a clearer
      workflow, and is now shown on startup if no other comparisons have been
      opened (Kai Willadsen)
    * Recently-used comparisons are now supported, allowing you to re-open
      previous comparisons directly. (Kai Willadsen)
    * Read-only files are now not editable by default, making merge actions
      clearer and more consistent. Individual read-only files can easily be set
      as editable as desired. (Kai Willadsen)

  Fixes:

    * New version control API, currently used by Git and Subversion (Kai
      Willadsen)
    * Version control compatibility updates and fixes (Cedric Le Dillau, Louis
      des Landes, Kai Willadsen)
    * Command line labelling options now apply to folder tabs (Kai Willadsen)
    * Regressions from parallel inline highlighting calculations have been
      fixed (Kai Willadsen)
    * Diff algorithm cleanups (Piotr Piastucki)
    * Compatibility fixes for Python 3; this does *not* mean that Meld works on
      Python 3 yet, just that 2to3 issues have been addressed (Kai Willadsen)

  Translations:
    * Daniel Mustieles (es)
    * Dominique Leuenberger (pt)
    * Enrico Nicoletto (pt_BR)
    * Florencio Neves (pt_BR)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)


2012-11-07 meld 1.7.0
=====================

  Features:

    * File comparisons are faster! Meld now has a smarter pre-processing step
      for inline highlighting of differences (Piotr Piastucki) and does its
      highlighting calculations asynchronously (Kai Willadsen), leading to
      better overall performance and interactivity.
    * Auto-merge mode is now available from the command-line (Piotr Piastucki)
    * Comparisons can be opened in new tabs (rather than in a new window) from
      the command line (Kacper Wysocki, Antoine, Kai Willadsen)
    * Custom colours can now be configured for all Meld drawing (Kai Willadsen)

  Fixes:

    * Improved behaviour when opening many tabs at once (Peter Tyser)
    * Notification of searches wrapping around the buffer (Philipp Müller)
    * Better compatibility with non-standard keyboard layouts (Stephan Hilb)
    * Better error reporting for failed VC comparisons (Kai Willadsen)
    * Version control compatibility updates and fixes (Jan Danielsson, Tim
      Babych, Kai Willadsen)
    * Other miscellaneous bug fixes (Jeff Oliver, Pacho Ramos, Rainer Suhm, Kai
      Willadsen)

  Translations:

    * Alexandre Franke (fr)
    * Daniel Mustieles (es)
    * Fran Diéguez (gl)
    * Gabor Kelemen (hu)
    * Matej Urbančič (sl)
    * Marek Černocký (cs)
    * Mario Blättermann (de)
    * Martin Srebotnjak (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)
2013-03-15 22:00:57 +00:00
wiz
63e7735f95 Update to 1.6.0:
2012-4-28 meld 1.6.0
====================

  Fixes:

    * Fix cursor location handling when our tree models change (Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Daniel Mustieles (es)
    * Daniel Șerbănescu (ro)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Piotr Drąg (pl)
2012-05-03 22:58:01 +00:00
wiz
b73e9f341d Update to 1.5.4:
2012-4-3 meld 1.5.4
====================

  Fixes:

    * Slightly faster diff calculation (Piotr Piastucki)
    * Avoid too-tall commit dialogues (Nguyễn Hồng Quân)
    * Minor bug fixes and performance improvments (Kai Willadsen)

  Translation updates:

    * Alexander Shopov (bg)
    * Fran Diéguez (gl)
    * Kjartan Maraas (nb)
    * Kristjan SCHMIDT (eo)
    * Nguyễn Thái Ngọc Duy (vi)
    * Toshiharu Kudoh (ja)
    * Trương Ứng Minh (vi)
    * Мирослав Николић (sr) (sr@latin)
2012-04-15 15:50:14 +00:00
wiz
d0e047e6cf Update to 1.5.3, update HOMEPAGE.
2012-1-27 meld 1.5.3
====================

  New features:

    * Add simple animations for chunk actions to make it easier to follow the
      result of insertion and deletion actions (Kai Willadsen)
    * Show the currently displayed page area in the side bars (Kai Willadsen)

  Fixes:

    * Don't show links between chunks where one of the chunks is completely
      off-screen, reducing visual clutter (Kai Willadsen)
    * Syntax highlighting will now assume that all files in a comparison are
      of the same type if we can't determine otherwise (Kai Willadsen)
    * Some fixes to colour usage and legibility for dark themes, with more
      theme fixes coming soon (Kai Willadsen)
    * Remember active filters across sessions in directory and VC comparions
      (Kai Willadsen)
    * Guess which version control system a user is most likely to want to see,
      in the event of multiple VCs in a single working copy (Kai Willadsen)
    * Work with Subversion 1.7 (Kai Willadsen)
    * Many sundry bug fixes (Aaron Schrab, Julian Taylor, Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Christian Kirbach (de)
    * Daniel Mustieles (es)
    * Fran Dieguez (gl)
    * Gabriel Speckhahn (pt_BR)
    * Jiro Matsuzawa (ja)
    * Jorge González (es)
    * Marcin Floryan (pl)
    * Marek Černocký (cs)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Petr Kovar (cs)
    * Piotr Drąg (pl)
    * Takeshi AIHANA (ja)
    * Yuri Myasoedov (ru)
2012-03-03 13:00:24 +00:00
wiz
e0b0395cd2 Update to 1.5.2:
2011-7-24 meld 1.5.2
=====================

  New features:

    * Add a new menu item and shortcut for switching between panes in
      file comparisons (Kai Willadsen)
    * Support type-ahead search in version control views (Oliver Gerlich)

  Fixes:

    * Non-editable files are now handled properly when doing sensitivity
      setting of change actions, and actions on the central change bar are
      presented accordingly (Piotr Piastucki, Kai Willadsen)
    * Fix incorrect comparison display in files containing FF or NEL linebreak
      literals (Kai Willadsen)
    * Updates to the Fossil version control support (Jan Danielsson)
    * Use faster validity check for Bazaar repositories (Kai Willadsen)
    * Many minor updates and other fixes (Tomasz Bury, Alan Horkan,
      Julian Taylor, Kai Willadsen)

  Translation updates
2011-08-06 10:45:21 +00:00
wiz
b340602987 Update to 1.5.1:
2011-3-20 meld 1.5.1
=====================

  New features:

    * Add menu items and keyboard shortcuts for version control and directory
      comparison actions (Kai Willadsen)
    * Add support for the Fossil SCM (Jan Danielsson)
    * Add a menu for switching between tabs (Kai Willadsen)
    * Add a menu item to unlock scrolling (Kai Willadsen)

  Code changes and fixes:

    * Improve filter handling with inline error reporting in the preference
      pane, and correct refreshing of file and directory comparisons on filter
      changes (Kai Willadsen)
    * Make line number display work with GtkSourceView 2.10+ (Piotr Piastucki)
    * Support external diff tools in subversion (Cedric Le Dillau)
    * Support CVSNT as a CVS alternative (Kai Willadsen)
    * Performance fixes for subversion and bazaar (Tristan Hill, Kirill Müller)
    * Correctly update a modified file's status in git and svn version control
      views (Peter Tyser)
    * Make temporary files unwritable to avoid unintentionally editing them
      (Peter Tyser)
    * Clean up diff results for cleaner comparisons (Piotr Piastucki)
    * Improve symlink and binary handling, and error cases for directory
      comparisons (Kai Willadsen)
    * Improve copy semantics for directories and symlinks (Kai Willadsen)
    * Show case insensitivity and file encoding errors less intrusively (Kai
      Willadsen)
    * Sundry bug fixes (Kai Willadsen, Piotr Piastucki)

  Translation updates:
    * Bruno Brouard (fr)
    * Claude Paroz (fr)
    * Daniel Mustieles (es)
    * Joe Hansen (da)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Miroslav Nikolić (sr)
    * Petr Kovar (cs)
    * Takeshi AIHANA (ja)


2010-12-27 meld 1.5.0
=====================

  New features:

    * Use MyersSequenceMatcher by default (matcher from Piotr Piastucki)
    * Add a "Show whitespace" preference (Jon Dufresne)
    * Add "Copy change above/below left/right" actions (Kai Willadsen)
    * Add Alt+Up/Down as shortcuts for previous/next change (Kai Willadsen)
    * Add previous/next conflict actions (Kai Willadsen)
    * Patch creation can now create reverse patches, and can choose between
      panes in a three-way comparison (Kai Willadsen)
    * Add a --output option for specifying where to save a merge result
      (Kai Willadsen)

  Code changes and fixes:

    * Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
    * Port to gtk.Builder and gtk.IconTheme (Kai Willadsen)
    * Remove gnome-vfs usage (Kai Willadsen)
    * Portability fixes (Thomas Klausner)
    * Build fixes (Helmut Jarausch)
    * Add a man page (Peter Tyser)
    * Put preferences fallback in XDG-compliant location (Kai Willadsen)
    * Fix Undo/Redo with unicode text (Kai Willadsen)
    * Handle unicode linebreaks (Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Carles Ferrando (ca@valencia)
    * Claude Paroz (fr)
    * Gabor Kelemen (hu)
    * Joe Hansen (da)
    * Jorge González (es)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Petr Kovar (cs)
2011-04-05 13:08:34 +00:00
wiz
4b4c4e6e90 Update to 1.3.3:
2010-09-09 meld-1.3.3
=====================

    * Highlight currently focused change (Kai Willadsen)

    * Add ability to check if version control repos are valid (Peter Tyser)

    * Support multiple-file undo/redo operations after save (Kai Willadsen)

    * Performance improvements, bug fixes and sundry contributions
      (Piotr Piastucki, Alexander Smishlajev, Robert Wahler, Kai Willadsen)

    * Translation updates:
      de (Mario Blättermann), es (Jorge González), fr (Bruno Brouard),
      ja (Takeshi AIHANA), sl (Matej Urbančič), zh_CN (Tao Wang)
2010-09-13 12:33:17 +00:00
drochner
afc07daa40 update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates
2010-08-09 11:33:53 +00:00
wiz
eb543f6c9e Update to 1.3.1:
2009-08-14 meld-1.3.1
=====================

	* Add svk support (Vincent Legoll)

	* Add support for marking conflicts as resolved (Matthijs van de Water,
	  Vincent Legoll)

	* Warp the text cursor to the start of jumped-to diff chunks (Vincent
	  Legoll)

	* Allow toggling of toolbar and statusbar visibility, and add a fullscreen
	  option (Michael Budde, Stephen Kennedy, Kai Willadsen)

	* Improved change merging and conflict resolution (Piotr Piastucki)

	* Speed up file comparisons and highlighting, significantly improving
	  interactive editing performance (Kai Willadsen, Piotr Piastucki)

	* Meld has a shiny new application icon (Josef Vybíral)
2009-08-21 08:30:30 +00:00
joerg
bacea7cad5 Remove @dirrm entries from PLISTs 2009-06-14 17:48:39 +00:00
wiz
c2b8d154c4 Update to 1.3.0:
2009-04-17 meld-1.3.0
=====================

        * Minimum requirements are pygobject 2.8 and python 2.4

        * Find dialog replaced with find bar with replace functionality

        * Remove gnome dependencies (Kai Willadsen, Vincent Legoll)
          Meld now runs on win32 (experimental).

        * Many ui tweaks and cleanups (Kai Willadsen, Vincent Legoll)

        * Support for multiple sourceview versions (Vincent Legoll)

        * Updated version control support
            * Multiple VCs in a single directory (Vincent Legoll)
            * Subversion 1.6.x (Vincent Legoll)
            * Add RCS support (Oliver Gerlich, Vincent Legoll)
            * Add Codeville support (Vincent Legoll)
2009-04-20 10:53:58 +00:00
wiz
7db5f1fc63 Update to 1.2.1. Fix locale file installation.
2008-xx-xx (sic!) meld-1.2.1
============================

	* Pygtk version 2.8 now required
	* Port to gtk.UIManager (Kai Willadsen)
	* Handle spaces in svn paths (Neil Mayhew)
	* Command-line auto-compare all option on startup (Ondrej Novy)
	* Command-line can launch several comparisons (Brian Holmes)
	* Several UI tweaks (better focus behavior, better defaults)
2008-11-24 14:03:56 +00:00
wiz
543b71396f Update to 1.2:
2008-06-26 meld-1.2
=======================

	* Improve tab rendering (Kai Willadsen)

	* Speedup folder comparison massively for large directories.

	* Fix crasher i18n bug (Kai Willadsen)

	* UI tweaks and cleanups (Tom Baugis, Kai Willadsen)

	* Cleanup vc library redundancy (Vincent Legoll)

	* Various version control fixes.
2008-07-18 09:43:57 +00:00
wiz
190dca33dd share/vi may also be used by editors/nvi; just try removing it.
Bump PKGREVISION.
2007-11-03 13:22:43 +00:00
obache
e137b2d196 Update meld to 1.1.5.1.
Patch provided by Dieter Roelants in PR 36488.

2007-06-12 meld-1.1.5.1
=======================

	* Do not ship .svn folders in tarball

2007-06-09 meld-1.1.5
=====================

	* Handle new version contol command line arguments.

	* CLI option to set the tab labels. Bug 138860.

	* Improve mime type detection from Tomasz Bury. Bug 156137.

	* Hold shift when scrolling to scroll the panes independently.

	* File & folder history now saved from Sam Jacobson.

	* Several small ui improvements.
2007-06-16 02:35:08 +00:00
wiz
220b641053 Initial import of meld-1.1.4:
Meld is a visual diff and merge tool. You can compare two or three
files and edit them in place (diffs update dynamically). You can
compare two or three folders and launch file comparisons. You can
browse and view a working copy from popular version control systems
such such as CVS, Subversion, Bazaar-ng and Mercurial.
2006-07-17 22:41:46 +00:00