Ubuntu
meld package

Failed "Merge All", TypeError: merge_all_non_conflicting_changes() takes exactly 1 argument (2 given)

Bug #1511945 reported by Andreas Schildbach
10
This bug affects 2 people
Affects Status Importance Assigned to Milestone
meld (Ubuntu)
Confirmed
Undecided
Unassigned

Bug Description

Since updating to Ubuntu Wily when resolving a git merge conflict with meld I get this message in the console when using "Merge All" from the menu.

TypeError: merge_all_non_conflicting_changes() takes exactly 1 argument (2 given)

The "Merge All" doesn't do anything. I'd expect to merge all the (non-conflicting) merge hunks that are marked in blue.

Revision history for this message
Zeno Gantner (zeno-gantner) wrote :

This is a known bug in meld 3.14.0, and it is fixed in 3.14.1:

http://meldmerge.org/news.html
"Fix crash with some GTK+ versions when using –output (Kai Willadsen)"

Revision history for this message
Andreas Schildbach (schildbach) wrote :

Thanks for the confirmation! Is there a process to fix this in Ubuntu too? It is appropriate to set this issue to "confirmed" status?

Revision history for this message
Zeno Gantner (zeno-gantner) wrote :

For completeness (the URL above may point to other stuff in the future), here are the release notes:
https://mail.gnome.org/archives/meld-list/2015-October/msg00000.html

Revision history for this message
Zeno Gantner (zeno-gantner) wrote :

The version in Debian testing is 3.14.1, so I would assume it will be fixed with the next Ubuntu release:
https://packages.debian.org/search?keywords=meld

I have no idea how Ubuntu handles bug fixes in between releases, sorry.

Andreas Schildbach (schildbach)
Changed in meld (Ubuntu):
status: New → Confirmed
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.