Your message dated Sun, 20 Mar 2011 22:32:58 +0000
with message-id <[email protected]>
and subject line Bug#565253: fixed in meld 1.5.0-1
has caused the Debian Bug report #565253,
regarding meld: Throws python exception when showing bzr diffs where file in a
moved directory has been edited
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
565253: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565253
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: meld
Version: 1.3.0-1
Severity: normal
Running 'meld .' in a bzr/svn/etc. working copy is a nice way to view
the diffs that have not been commited yet.
This, however causes an exception if a file that is inside a renamed
directory is edited:
(in the following, when running 'meld .', meld's window comes up, but
shows no differences, and the exception is printed to the terminal)
abeld@csik:0:~/meld-debugging$ mkdir foo
abeld@csik:0:~/meld-debugging$ cd foo/
abeld@csik:0:~/meld-debugging/foo$ mkdir bar
abeld@csik:0:~/meld-debugging/foo$ touch bar/foobar
abeld@csik:0:~/meld-debugging/foo$ bzr init .
Created a standalone tree (format: pack-0.92)
abeld@csik:0:~/meld-debugging/foo$ bzr st
unknown:
bar/
abeld@csik:0:~/meld-debugging/foo$ bzr add bar/
adding bar
adding bar/foobar
abeld@csik:0:~/meld-debugging/foo$ bzr st
added:
bar/
bar/foobar
abeld@csik:0:~/meld-debugging/foo$ bzr ci -m'commit'
Committing to: /home/abeld/meld-debugging/foo/
added bar
added bar/foobar
Committed revision 1.
abeld@csik:0:~/meld-debugging/foo$ bzr move bar zork
bar => zork
abeld@csik:0:~/meld-debugging/foo$ echo "some edits" > zork/foobar
abeld@csik:0:~/meld-debugging/foo$ bzr st
renamed:
bar/ => zork/
modified:
zork/foobar
abeld@csik:0:~/meld-debugging/foo$ bzr diff
=== renamed directory 'bar' => 'zork'
=== modified file 'zork/foobar'
--- bar/foobar 2010-01-14 09:09:54 +0000
+++ zork/foobar 2010-01-14 09:10:29 +0000
@@ -0,0 +1,1 @@
+some edits
abeld@csik:1:~/meld-debugging/foo$ meld .
Traceback (most recent call last):
File "/usr/lib/meld/task.py", line 130, in iteration
ret = task()
File "/usr/lib/meld/vcview.py", line 283, in _search_recursively_iter
self.vc.cache_inventory(rootname)
File "/usr/lib/meld/vc/bzr.py", line 57, in cache_inventory
self._tree_cache = self.lookup_tree(rootdir)
File "/usr/lib/meld/vc/bzr.py", line 88, in lookup_tree
tree_state[os.path.join(rootdir, entry[2:])] = cur_state
UnboundLocalError: local variable 'cur_state' referenced before assignment
abeld@csik:0:~/meld-debugging/foo$ meld --version
meld 1.3.0
I assume this is a different bug than
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471297
although that is triggered by a somewhat similar situation.
Daniel Abel
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (900, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.26-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages meld depends on:
ii python 2.5.4-2 An interactive high-level object-o
ii python-glade2 2.14.1-3 GTK+ bindings: Glade support
ii python-gnome2 2.26.1-1 Python bindings for the GNOME desk
ii python-gtk2 2.14.1-3 Python bindings for the GTK+ widge
ii python-support 1.0.3 automated rebuilding support for P
Versions of packages meld recommends:
ii python-gnome2-desktop 2.24.1-1 Python bindings for the GNOME desk
ii yelp 2.22.1-8 Help browser for GNOME 2
meld suggests no packages.
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: meld
Source-Version: 1.5.0-1
We believe that the bug you reported is fixed in the latest version of
meld, which is due to be installed in the Debian FTP archive:
meld_1.5.0-1.debian.tar.gz
to main/m/meld/meld_1.5.0-1.debian.tar.gz
meld_1.5.0-1.dsc
to main/m/meld/meld_1.5.0-1.dsc
meld_1.5.0-1_all.deb
to main/m/meld/meld_1.5.0-1_all.deb
meld_1.5.0.orig.tar.gz
to main/m/meld/meld_1.5.0.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Balint Reczey <[email protected]> (supplier of updated meld package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Thu, 30 Dec 2010 15:11:35 +0100
Source: meld
Binary: meld
Architecture: source all
Version: 1.5.0-1
Distribution: experimental
Urgency: low
Maintainer: Ross Burton <[email protected]>
Changed-By: Balint Reczey <[email protected]>
Description:
meld - graphical tool to diff and merge files
Closes: 545359 565253 602988
Changes:
meld (1.5.0-1) experimental; urgency=low
.
* New upstream release
- Use TextBuffer instead of maintaining duplicate copy of text
(Closes: #602988)
- Use Subversion's XML status output (Closes: #545359)
- Use bzr 'short' status for more robust parsing (Closes: #565253)
- Add a man page (Peter Tyser)
- Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
* bump version of dependencies
* depend on python-gobject
* drop Debian specific man page
Checksums-Sha1:
c3445197700050fa501b776e4582e92cac724c1e 1333 meld_1.5.0-1.dsc
52b3e06fc51211f00b7da85923e75dc97d51044f 483132 meld_1.5.0.orig.tar.gz
673ca2dce3e1b515a98b8822d512691607ee085b 6481 meld_1.5.0-1.debian.tar.gz
669e2055088cc5ea29b1faf41cd2d06f32c5510e 374738 meld_1.5.0-1_all.deb
Checksums-Sha256:
c2ea9861ffefab9460de8981ac3857f0ee8405cb133114404544c67ca2a57ca1 1333
meld_1.5.0-1.dsc
fdf47ef6fcd6a24b3fd9f11c164e7fd745a23ae1874a91fbb4ebc82f60a04794 483132
meld_1.5.0.orig.tar.gz
c19c043834f3a813744086e156a420e87af88d151ec15585ff232f4257173963 6481
meld_1.5.0-1.debian.tar.gz
92e608786989a7e69d0863109f4d6ad5322d0576f8761a5020735418a5cdc769 374738
meld_1.5.0-1_all.deb
Files:
527697f10d6080aa2ed3e5651a227dc5 1333 gnome optional meld_1.5.0-1.dsc
7227dfc003a50ec9ea0859e0c66fa160 483132 gnome optional meld_1.5.0.orig.tar.gz
531df88eca626f4ecc875da466487876 6481 gnome optional meld_1.5.0-1.debian.tar.gz
fc2a3e7fe81eedfa5d750d8f5534adc2 374738 gnome optional meld_1.5.0-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk2F2u0ACgkQhTV17EoIsv4qfwCg0l7T29+LpfjXhABxPlwiP/w0
sVAAni/75SFBx/lDVsClgfkyRaSs2P3C
=2V9N
-----END PGP SIGNATURE-----
--- End Message ---
