Cannot compare views with conflict revision

[Angel Guzman Maeso]

I get this errors and empty panels side by side:

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/meld/newdifftab.py", line 113, in on_button_compare_clicked
    recent_comparisons.add(tab)
  File "/usr/lib/python2.7/dist-packages/meld/recent.py", line 105, in add
    display_name = _("Version control:") + " " + display_path
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 16: ordinal not in range(128)
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 575, in <lambda>
    self.append_diff(arg, **kwargs))
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 632, in append_diff
    return self.append_filediff(paths, merge_output=merge_output)
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 608, in append_filediff
    doc.set_merge_output_file(merge_output)
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1036, in set_merge_output_file
    buf.data.set_label(filename)
AttributeError: 'MeldBufferData' object has no attribute 'set_label'
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/meld/task.py", line 110, in iteration
    ret = next(task)
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1224, in _set_files_internal
    for i in self._load_files(files, self.textbuffer):
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1092, in _load_files
    yield _("[%s] Set num panes") % self.label_text
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 19: ordinal not in range(128)
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 575, in <lambda>
    self.append_diff(arg, **kwargs))
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 632, in append_diff
    return self.append_filediff(paths, merge_output=merge_output)
  File "/usr/lib/python2.7/dist-packages/meld/meldwindow.py", line 608, in append_filediff
    doc.set_merge_output_file(merge_output)
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1036, in set_merge_output_file
    buf.data.set_label(filename)
AttributeError: 'MeldBufferData' object has no attribute 'set_label'
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/meld/task.py", line 110, in iteration
    ret = next(task)
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1224, in _set_files_internal
    for i in self._load_files(files, self.textbuffer):
  File "/usr/lib/python2.7/dist-packages/meld/filediff.py", line 1092, in _load_files
    yield _("[%s] Set num panes") % self.label_text
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 19: ordinal not in range(128)

ProblemType: Bug
DistroRelease: Ubuntu 14.10
Package: meld 3.11.0-1
ProcVersionSignature: Ubuntu 3.13.0-24.47-generic 3.13.9
Uname: Linux 3.13.0-24-generic x86_64
ApportVersion: 2.14.2-0ubuntu3
Architecture: amd64
CurrentDesktop: Unity
Date: Tue May 20 12:52:37 2014
InstallationDate: Installed on 2014-05-08 (11 days ago)
InstallationMedia: Ubuntu 14.04 LTS "Trusty Tahr" - Release amd64 (20140417)
PackageArchitecture: all
SourcePackage: meld
UpgradeStatus: No upgrade log present (probably fresh install)

[Mantas Kriaučiūnas (mantas)]

Latest meld 3.11.1-1 release from Debian experimental fixes lots of problems in 3.11.0 , please install and test meld 3.11.1-1 from Debian experimental and check if your problem isn't fixed.
If your issue is fixed in meld 3.11.1-1, then please marking this bug as a duplicate of LP bug #1298266 (please sync meld 3.11.1-1 from Debian experimental)

[Angel Guzman Maeso (shakaran)]

Thanks Mantas

I did the following based in https://wiki.debian.org/DebianExperimental

echo " deb http://ftp.debian.org/debian experimental main" | sudo tee -a /etc/apt/sources.list
sudo apt-get update; sudo apt-get -t experimental install meld

it still show some problems with branches (revisions):

$ meld
fatal: bad revision '^origin/closed_deals'
fatal: bad revision '^origin/country-admin'
fatal: bad revision '^origin/dropdown-refactor'
fatal: bad revision '^origin/ride'
fatal: bad revision '^origin/test'
fatal: bad revision '^origin/user_ratings'

I cannot compare the side by side, but I could do in following days.

[Paul White (paulw2u)]

We are sorry that we do not always have the capacity to review all reported bugs in a timely manner.

This release of Ubuntu is no longer receiving maintenance updates. If this is still an issue using a maintained version of Ubuntu then please let us know otherwise this report can be left to expire in approximately 60 days time.

Paul White
[Ubuntu Bug Squad]

[Launchpad Janitor (janitor)]

[Expired for meld (Ubuntu) because there has been no activity for 60 days.]