Your message dated Tue, 02 Jun 2009 09:47:34 +0000
with message-id <[email protected]>
and subject line Bug#465804: fixed in meld 1.3.0-1
has caused the Debian Bug report #465804,
regarding assert self.deleted_lines_pending == -1
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.)
--
465804: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=465804
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: mercurial
Version: 0.9.5-3
Severity: normal
Mercurial crashes when running a rather messy merge.
(One file had \n converted to \r\n by accident.)
I get these error messages:
merging isca_coart.tex
Traceback (most recent call last):
File "/usr/lib/meld/filediff.py", line 273, in after_text_delete_range
self._after_text_modified(buffer, starting_at, -self.deleted_lines_pending)
File "/usr/lib/meld/filediff.py", line 222, in _after_text_modified
change_range = self.linediffer.change_sequence( pane, startline,
sizechange, self._get_texts())
File "/usr/lib/meld/diffutil.py", line 104, in change_sequence
changes[1] = self._change_sequence( 1, sequence, startidx, sizechange,
texts)
File "/usr/lib/meld/diffutil.py", line 143, in _change_sequence
assert rangex[0] <= rangex[1] and range1[0] <= range1[1]
AssertionError
Traceback (most recent call last):
File "/usr/lib/meld/filediff.py", line 406, in on_text_delete_range
assert self.deleted_lines_pending == -1
AssertionError
1 files updated, 4 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.22-3-686 (SMP w/1 CPU core)
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash
Versions of packages mercurial depends on:
ii libc6 2.7-6 GNU C Library: Shared libraries
ii python 2.4.4-6 An interactive high-level object-o
ii python-support 0.7.6 automated rebuilding support for p
Versions of packages mercurial recommends:
ii meld 1.1.5.1-2 graphical tool to diff and merge f
ii rcs 5.7-21 The GNU Revision Control System
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: meld
Source-Version: 1.3.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.3.0-1.diff.gz
to pool/main/m/meld/meld_1.3.0-1.diff.gz
meld_1.3.0-1.dsc
to pool/main/m/meld/meld_1.3.0-1.dsc
meld_1.3.0-1_all.deb
to pool/main/m/meld/meld_1.3.0-1_all.deb
meld_1.3.0.orig.tar.gz
to pool/main/m/meld/meld_1.3.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.
Ross Burton <[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: Tue, 02 Jun 2009 10:00:20 +0100
Source: meld
Binary: meld
Architecture: source all
Version: 1.3.0-1
Distribution: unstable
Urgency: low
Maintainer: Ross Burton <[email protected]>
Changed-By: Ross Burton <[email protected]>
Description:
meld - graphical tool to diff and merge files
Closes: 428843 465804 509069 511027 523576 528327
Changes:
meld (1.3.0-1) unstable; urgency=low
.
* New upstream release (Closes: #528327)
- Copy/paste behaviour fixes (Closes: #523576)
- Dotfiles and removals handled in darcs (Closes: #509069)
- Can handle Mercurial repos (Closes: #428843)
- Up/Down patch used to skip changes (Closes: #511027)
- Handle last line when highlighting properly (Closes: #465804)
* Update message and depends for new python-gtksourceview2 package
* Resync makefile.patch
* Remove python-gnome dependency
Checksums-Sha1:
0917cd20bb20ae56f63c873c4077c779e1e395b1 1147 meld_1.3.0-1.dsc
3636cbbd2138aeacd4c962d9234ad0bcf0753a92 883758 meld_1.3.0.orig.tar.gz
59d8bd678fe86f2fa2843d569ba020b5cc17f981 5026 meld_1.3.0-1.diff.gz
deeac0fcc023de095dde56304406b9f1d4897937 794148 meld_1.3.0-1_all.deb
Checksums-Sha256:
046f34c934f9a60e9b394bd56cb5b56f0b1339bb5b32a2ef12bb653b41d995a7 1147
meld_1.3.0-1.dsc
bc64e641574b38bbd8c5bb738b2dd5ac749b2a3fb82bc56e4fa99a81db3ba66b 883758
meld_1.3.0.orig.tar.gz
c5a107cfa13bcacfee0aeb3b3d26f1fcf7b0245a9f2e4fc3b89947f5bf8cf075 5026
meld_1.3.0-1.diff.gz
e261cbe3de25e846111b2230fb168514af5c50e4d1b24503a24ee3ecc0ccfe62 794148
meld_1.3.0-1_all.deb
Files:
3ac61c9197dedeb7dc5c7dc3da5ad40e 1147 gnome optional meld_1.3.0-1.dsc
5cfc42077ba0bb9f03d6e568dbd906d7 883758 gnome optional meld_1.3.0.orig.tar.gz
0a1adfdc6c802f7e3cf9d81c6048d99b 5026 gnome optional meld_1.3.0-1.diff.gz
72a5d43a0a25d00e596e129a0f710e1b 794148 gnome optional meld_1.3.0-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFKJPFMLQnkR9C0M98RAhKKAJsFsjjiCcVtU97KNlbEAGrfV0oa+ACgwVH8
AD1wzw/BYdQKRMlt77hV/ac=
=EaMN
-----END PGP SIGNATURE-----
--- End Message ---
