Meld crashes if svn working dir contains svn externals dirs

Bug #787831 reported by Svein Seldal
20
This bug affects 3 people
Affects Status Importance Assigned to Milestone
meld (Ubuntu)
Fix Released
Undecided
Unassigned
Natty
Fix Released
Undecided
Unassigned

Bug Description

Binary package hint: meld

If I run meld in a SVN working copy to display local modifications, meld crashes if the working copy contains a SVN externals directory.

TESTCASE:
svnadmin create /tmp/test-repo
svn co file:///tmp/test-repo repo
cd repo
echo "bla" > file
svn add file
svn commit
svn cp file new-copy; meld .

The following traceback is given:
Traceback (most recent call last):
  File "/usr/lib/meld/meld/task.py", line 130, in iteration
    ret = task()
  File "/usr/lib/meld/meld/vcview.py", line 330, in _search_recursively_iter
    entries = filter(showable, self.vc.listdir(root))
  File "/usr/lib/meld/meld/vc/_vc.py", line 166, in listdir
    dirs, files = self.lookup_files(cdirs, cfiles)
  File "/usr/lib/meld/meld/vc/_vc.py", line 175, in lookup_files
    return self._get_dirsandfiles(directory, dirs, files)
  File "/usr/lib/meld/meld/vc/svn.py", line 105, in _get_dirsandfiles
    for match in self._get_matches(directory):
  File "/usr/lib/meld/meld/vc/svn.py", line 95, in _get_matches
    rev = status.attrib["revision"]
KeyError: 'revision'

regression potential:
low, small easily backported fix
The fix was released in 1.5.1 in oneiric and there are no reported regressions.

System info: Natty on amd64. meld 1.5.0-0ubuntu1

Related branches

Julian Taylor (jtaylor)
Changed in meld (Ubuntu):
status: New → Confirmed
Revision history for this message
Julian Taylor (jtaylor) wrote :

fixed upstream in commit 8d7e4aff715a933957a9cec99175fd15fec846a6

http://git.gnome.org/browse/meld/commit/?id=8d7e4aff715a933957a9cec99175fd15fec846a6

tags: added: patch
Revision history for this message
Julian Taylor (jtaylor) wrote :

the fix is included in meld 1.5.1 published in oneiric

Changed in meld (Ubuntu):
status: Confirmed → Fix Released
Julian Taylor (jtaylor)
description: updated
Julian Taylor (jtaylor)
description: updated
Changed in meld (Ubuntu Natty):
status: New → Triaged
Revision history for this message
Chris Halse Rogers (raof) wrote : Please test proposed package

Hello Svein, 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!

Changed in meld (Ubuntu Natty):
status: Triaged → Fix Committed
tags: added: verification-needed
Svein Seldal (sveinse)
tags: added: verification-done
removed: verification-needed
Revision history for this message
Launchpad Janitor (janitor) wrote :

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

Changed in meld (Ubuntu Natty):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.