[meld] Created tag 1.7.2
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Created tag 1.7.2
- Date: Mon, 15 Apr 2013 21:57:57 +0000 (UTC)
The unsigned tag '1.7.2' was created.
Tagger: Kai Willadsen <kai willadsen gmail com>
Date: Tue Apr 16 07:52:35 2013 +1000
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)
Changes since the last tag '1.7.1':
Daniel Mustieles (2):
Updated Spanish translation
Updated Spanish translation
Gabor Kelemen (2):
Updated Hungarian translation
Updated Hungarian translation
Kai Willadsen (36):
Fix pygtk 2.16 incompatiblity
Fix initialisation of translations under Windows
Fix support for 'threaded' diff by using threads on Windows
Avoid some GTK+ warnings by ensuring a style is set on required widgets
PEP8 fixes for matchers
Mark merge descriptors for translation
Rework some conflict list logic
Correctly start merge mode with output file for non-auto merges
Open folder comparison when 'Compare'ing folders in VC view
Fix release date of 1.7.1 in NEWS
PEP8 cvs.py
Validate CVS using local info rather than roundtrip (closes bgo#663128)
Fix adding directories on CVS and SVN (closes bgo#501098)
Correctly handle Save/Save As action sensitivity (closes bgo#456704)
Don't use select() on Windows (closes bgo#578985)
Apply blank line ignoring for folder comparisons (closes bgo#695912)
Give our NotebookLabel a custom type
Fix untested typo from commit d85080
Try both which and where on Windows
Fix Windows-style paths when passing refs to Git (close bgo#615661)
Re-add writeable permission before deleting temp files on Windows
Handle DirDiff sensitivity based on selection (closes bgo#691216)
Handle sensitivity for error and missing file rows
PEP8 fixes
Initial very dubious UI for sync points, and associated fixes
Allow synchronisation points to be added individually and cleared
Clear inline highlighting tags on comparison refresh
Draw indicators for syncpoints
Set saner default paths in new tab file choosers (closes bgo#697085)
Fix referencing the main actiongroup before tab was swapped in
Fix some handling of unicode file names (closes bgo#168760, bgo#694099)
Fix universal newline support on Windows (closes bgo#687729)
Require our mime XML for the Makefile install rule (closes bgo#697811)
Mark our mime XML translatable and ignore its byproduct
Update NEWS
Pre-release version bump
Kalev Lember (1):
build: Only update the MIME cache when DESTDIR isn't set
Louis des Landes (7):
Add CONFLICT types and get_path_for_conflict methods to bzr and git
Add kwargs to create-diff signal and use to specify merge output
Open conflicted files in a 3 way auto merge.
Add get_path_for_repo_file to bzr VC
Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same
Fix is_temp being passed to the actual diff emit
Marek Černocký (1):
Updated Czech translation
Martin Srebotnjak (1):
Updated Slovenian translation
Matej Urbančič (2):
Updated Slovenian translation
Updated Slovenian translation
Piotr Drąg (5):
Updated Polish translation
Updated Polish translation
Updated POTFILES.in
Fix mime XML translability
Updated Polish translation
Piotr Piastucki (1):
Add SyncPointMyersSequenceMatcher and matcher-related unit tests
Psykar (1):
Add is_temp return to 'get_path_for_conflict' for non-temporary files
Rafael Ferreira (3):
Updated Brazilian Portuguese translation
Updated Brazilian Portuguese translation
Updated Brazilian Portuguese translation
Мирослав Николић (1):
Updated Serbian translation
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]