Re: Meld 1.7.2 released
- From: Mark Mikofski <bwanamarko yahoo com>
- To: Kai Willadsen <kai willadsen gmail com>, meld-list <meld-list gnome org>, "gnome-announce-list gnome org" <gnome-announce-list gnome org>
- Subject: Re: Meld 1.7.2 released
- Date: Wed, 17 Apr 2013 11:34:59 -0700 (PDT)
----- Original Message -----
From: Kai Willadsen <kai willadsen gmail com>
To: meld-list <meld-list gnome org>; gnome-announce-list gnome org
Cc:
Sent: Monday, April 15, 2013 3:02 PM
Subject: Meld 1.7.2 released
Meld 1.7.2 has been released.
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)
This release can be downloaded from:
http://download.gnome.org/sources/meld/1.7/meld-1.7.2.tar.xz
What is Meld?
-------------
Meld is a visual diff and merge tool. It lets you compare two or three files,
and updates the comparisons while you edit them in-place. You can also compare
folders, launching comparisons of individual files as desired. Last but by no
means least, Meld lets you work
with your current changes in a wide variety of
version control systems, including Git, Bazaar, Mercurial, Subversion and CVS.
_______________________________________________
meld-list mailing list
meld-list gnome org
https://mail.gnome.org/mailman/listinfo/meld-list
Hi Kai,
Thanks!
is libintl required? I got this traceback the first time I tried meld-1.7.2:
whoami computer meld-1.7.2/bin
$ ./meld
Traceback (most recent call last):
File "c:/meld/bin/meld", line 98, in <module>
libintl = cdll.intl
File
"c:\Python27\lib\ctypes\__init__.py", line 435, in __getattr__
dll = self._dlltype(name)
File "c:\Python27\lib\ctypes\__init__.py", line 365, in __init__
self._handle = _dlopen(self._name, mode)
WindowsError: [Error 126] The specified module could not be found
I edited bin/meld (98) to load GNU.Gettext.dll from the x64 GTK runtime and it started then crashed python.
Now it crashes python everytime. I get the following trackeback:
whoami computer meld-1.7.2/bin
$ ./meld
Couldn't bind the translation domain. Some translations won't work.
function 'bindtextdomain' not found
(python.exe:7472): GLib-GIO-CRITICAL **:
g_loadable_icon_load: assertion `G_IS_LOADABLE_ICON (icon)' failed
./meld:167: GtkWarning: Could not find the icon 'gtk-file'. The 'hicolor' theme
was not found either, perhaps you need to install it.
You can get a copy from:
http://icon-theme.freedesktop.org/releases
gtk.main()
**
Gtk:ERROR:gtkrecentmanager.c:1942:get_icon_fallback: assertion failed: (retval != NULL)
This application has requested the Runtime to terminate it in an unusual way.
Please contact the application's support team for more information.
and then python crashes.
Windows 7 x64
python 2.7.3 x64
meld 1.7.2
Thanks,
Mark Mikofski
poquitopicante.blogspot.com
breakingbytes.blogspot.com
www.breaking-bytes.com
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]