[natty] meld hangs comparing attached files

[Jakob Unterwurzacher]

Binary package hint: meld

meld 1.5.0-0ubuntu1, i386, Ubuntu Natty.
Upgrading to 1.5.1 from debian experimental solves the problem ( http://packages.debian.org/experimental/meld )

TESTCASE:
extract the attached file.
open them with
> meld mine original

what should happen: meld shows a diff
what happens: meld hangs

regression potential:
low, simple easily backported fix.
release since 1.5.1 in oneiric with no reported regressions.

[Julian Taylor (jtaylor)]

this commit fixes the issue:
http://git.gnome.org/browse/meld/commit/?id=0e7cc5202895acbe5c23ca964e2962ea2d3cec2a

[Charlie Kravetz (cjkgeek)]

Thank you for taking the time to report this bug and helping to make Ubuntu better. However, I am closing it because the bug has been fixed in the latest development version of Ubuntu - Oneiric Ocelot.

The Natty task should remain open/triaged until the fix is backported to Ubuntu 11.04.

[Marc Deslauriers (mdeslaur)]

SRU request:

Impact: some files may cause meld to hang when parsing them (See attached examples)
Package has been fixed by backporting a specific commit. (See attached minimal debdiff)

[Marc Deslauriers (mdeslaur)]

SRU Team: Please cancel this upload. I've been informed that this is an incomplete fix until bug #786134 gets fixed also.

[Martin Pitt (pitti)]

I rejected the meld upload.

[Chris Halse Rogers (raof)]

Hello Jakob, or anyone else affected,

Accepted meld into natty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

[Launchpad Janitor (janitor)]

This bug was fixed in the package meld - 1.5.0-0ubuntu1.1

---------------
meld (1.5.0-0ubuntu1.1) natty-proposed; urgency=low

  * debian/patches/fix_iteration.patch
    - Fix hangup when comparing some files (LP: #774265)
  * debian/patches/fix-786134.patch
    - Fix another hangup when comparing some files (LP: #786134)
  * debian/patches/fix-svn-external-crash.patch
    - Fix crash when svn wc contains externals (LP: #787831)
  * debian/patches/fix-vcs-cwd.patch
    - allow opening vcs diff from outside of vcs-dir (LP: #770549)
 -- Julian Taylor <email address hidden> Mon, 22 Aug 2011 13:17:43 +0200

[Volodia (wojciechblaszczuk)]

regression in ver. 3.16.4-1 ?
it not hangs, but when one of file (in 3-way diff) have no NL on the end - the problem as described here appears: https://bugs.launchpad.net/ubuntu/+source/meld/+bug/829535

[Balint Reczey (rbalint)]

This does not fail for me in Debian unstable:

echo foo > bar ; echo bar > foo ; echo -n line > nonewline ; meld bar foo nonewline

Do you have a simple test case?

[Volodia (wojciechblaszczuk)]

ehm... it's stranger - it happens only when conditions:

Cmp files about ~5k lines.
3-way.

- no white line on the end (always 100%)
- then add line are on the end of 1st file on left
  --- then I could remove it and CPU usage is low (1 core btw.)
  --- viewport not on the end of file and cursor outside of viewport (but not repetitive on new instance, much less unresolved diffs was when it not happend...)

I will try debug on my own.