Bug 13243 - meld fails on conflicting files in subversion
Summary: meld fails on conflicting files in subversion
Status: RESOLVED OLD
Alias: None
Product: Mageia
Classification: Unclassified
Component: RPM Packages (show other bugs)
Version: 4
Hardware: x86_64 Linux
Priority: Normal normal
Target Milestone: ---
Assignee: Mageia Bug Squad
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-20 21:04 CEST by Marc Krämer
Modified: 2015-01-26 19:02 CET (History)
1 user (show)

See Also:
Source RPM: meld-1.8.2-1.mga4.src.rpm
CVE:
Status comment:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Marc Krämer 2014-04-20 21:04:31 CEST 
svn st

C       dirSelect.php
?       dirSelect.php.merge-left.r7505
?       dirSelect.php.merge-right.r7528
?       dirSelect.php.working

[marc@haudraufwienix main-devel]$ meld dirSelect.php
Traceback (most recent call last):
  File "/usr/bin/meld", line 173, in <module>
    main()
  File "/usr/bin/meld", line 165, in main
    new_window = app.parse_args(sys.argv[1:])
  File "/usr/share/meld/meld/meldapp.py", line 169, in parse_args
    tab = open_paths(args, options.auto_compare, options.auto_merge)
  File "/usr/share/meld/meld/meldwindow.py", line 791, in open_paths
    self._single_file_open(a)
  File "/usr/share/meld/meld/meldwindow.py", line 784, in _single_file_open
    doc.run_diff(path)
  File "/usr/share/meld/meld/vcview.py", line 528, in run_diff
    for c in conflicts]
  File "/usr/share/meld/meld/vc/svn.py", line 140, in get_path_for_conflict
    return glob.glob('%s.merge-right.r*' % path)[0], False
IndexError: list index out of range


Reproducible: 

Steps to Reproduce:
Comment 1 Olivier FAURAX 2015-01-26 17:32:53 CET 
Are you able to test if the problem is still there in a more recent version of meld (from the upstream website)?

CC: (none) => olivier

Comment 2 Marc Krämer 2015-01-26 19:02:21 CET 
recent versions did solve the problem.

Status: NEW => RESOLVED
Resolution: (none) => OLD
Note You need to log in before you can comment on or make changes to this bug.