After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 736675 - traceback with --auto-merge
traceback with --auto-merge
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2014-09-15 14:01 UTC by Jiri Popelka
Modified: 2014-09-18 20:14 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
patch (2.01 KB, patch)
2014-09-15 14:01 UTC, Jiri Popelka 		none Details | Review

Description Jiri Popelka 2014-09-15 14:01:07 UTC 
Created attachment 286205 [details] [review]
patch

I use meld as a git merge-tool and have this in my .gitconfig:

[mergetool]
  cmd = meld --auto-merge --output $MERGED $LOCAL $BASE $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE

however with 3.11 it tracebacks.

Steps to Reproduce:
1. meld --auto-merge --output m l b r --diff b l --diff b r

Actual results:
Traceback (most recent call last):

+ Trace 234094

  • File "/usr/lib/python2.7/site-packages/meld/meldapp.py", line 70 in do_command_line 
    tab = self.parse_args(command_line)
  • File "/usr/lib/python2.7/site-packages/meld/meldapp.py", line 275 in parse_args 
    focus=i == 0)
  • File "/usr/lib/python2.7/site-packages/meld/meldapp.py", line 142 in open_paths 
    return window.open_paths(paths, **kwargs)
  • File "/usr/lib/python2.7/site-packages/meld/meldwindow.py", line 687 in open_paths 
    paths, auto_compare=auto_compare, auto_merge=auto_merge)
  • File "/usr/lib/python2.7/site-packages/meld/meldwindow.py", line 633 in append_diff 
    return self.append_filemerge(paths, merge_output=merge_output)
  • File "/usr/lib/python2.7/site-packages/meld/meldwindow.py", line 615 in append_filemerge 
    assert len(files) == 3 AssertionError

See attached patch.
Comment 1 Kai Willadsen 2014-09-18 20:14:45 UTC 
This problem has been fixed in the development version. The fix will be available in the next major software release. Thank you for your bug report.