| Summary: | meld fails on conflicting files in subversion | ||
|---|---|---|---|
| Product: | Mageia | Reporter: | Marc Krämer <mageia> |
| Component: | RPM Packages | Assignee: | Mageia Bug Squad <bugsquad> |
| Status: | RESOLVED OLD | QA Contact: | |
| Severity: | normal | ||
| Priority: | Normal | CC: | olivier |
| Version: | 4 | ||
| Target Milestone: | --- | ||
| Hardware: | x86_64 | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Source RPM: | meld-1.8.2-1.mga4.src.rpm | CVE: | |
| Status comment: | |||
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 recent versions did solve the problem. Status:
NEW =>
RESOLVED |
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: