Your message dated Sat, 10 Jun 2006 09:02:07 -0700 with message-id <[EMAIL PROTECTED]> and subject line Bug#368681: fixed in cvs 1:1.12.13-3 has caused the attached Bug report 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 I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database)
--- Begin Message ---Package: cvs Version: 1:1.12.13-2 Severity: grave Justification: renders package unusable CVS now cannot detect conflicted merges ("C" state) anymore, which is bound to cause all sort of broken commits if people doesn't notice it in time. I didn't actually *try* to commit a file with merge conflicts, but cvs update and cvs status both fail to detect the file is full of "<<<<<", "====" and ">>>>" hunks... -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (990, 'unstable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.16.17-debian13+bluesmoke+lm85 Locale: LANG=pt_BR.ISO-8859-1, LC_CTYPE=pt_BR.ISO-8859-1 (charmap=ISO-8859-1) Versions of packages cvs depends on: ii debconf [debconf-2.0] 1.5.1 Debian configuration management sy ii libc6 2.3.6-9 GNU C Library: Shared libraries ii libpam-runtime 0.79-3.1 Runtime support for the PAM librar ii libpam0g 0.79-3.1 Pluggable Authentication Modules l ii zlib1g 1:1.2.3-11 compression library - runtime Versions of packages cvs recommends: ii info [info-browser] 4.8.dfsg.1-1 Standalone GNU Info documentation ii konqueror [info-browser] 4:3.5.2-2+b1 KDE's advanced file manager, web b ii netbase 4.25 Basic TCP/IP networking system ii pinfo [info-browser] 0.6.9-2 An alternative info-file viewer ii xemacs21-mule [info-browser 21.4.19-1 highly customizable text editor -- -- debconf information excluded -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh
--- End Message ---
--- Begin Message ---Source: cvs Source-Version: 1:1.12.13-3 We believe that the bug you reported is fixed in the latest version of cvs, which is due to be installed in the Debian FTP archive: cvs_1.12.13-3.diff.gz to pool/main/c/cvs/cvs_1.12.13-3.diff.gz cvs_1.12.13-3.dsc to pool/main/c/cvs/cvs_1.12.13-3.dsc cvs_1.12.13-3_i386.deb to pool/main/c/cvs/cvs_1.12.13-3_i386.deb 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. Steve McIntyre <[EMAIL PROTECTED]> (supplier of updated cvs 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.7 Date: Fri, 09 Jun 2006 20:13:53 +0100 Source: cvs Binary: cvs Architecture: source i386 Version: 1:1.12.13-3 Distribution: unstable Urgency: low Maintainer: Steve McIntyre <[EMAIL PROTECTED]> Changed-By: Steve McIntyre <[EMAIL PROTECTED]> Description: cvs - Concurrent Versions System Closes: 368681 368909 Changes: cvs (1:1.12.13-3) unstable; urgency=low . [ Steve McIntyre ] * debian/patches: + Add 95_flag_conflicted_copies - patch from upstream to fix breakage in conflict handling. Closes: #368681 . [ Zak B. Elep ] * debian/patches: + Add 12_rcs2log_POSIX_sort to let rcs2log use unambigous sort flags. (Closes: #368909) Files: 5298314ac3facf7a6ec5c23e965df5ba 745 devel optional cvs_1.12.13-3.dsc 700fbf8d7ac9da60834d167fad6c3dfb 69127 devel optional cvs_1.12.13-3.diff.gz b2084f7785e1140f7415800817f82b25 1667042 devel optional cvs_1.12.13-3_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFEiulifDt5cIjHwfcRAs33AJ9kNZDyir4alCKAnMc1/Uhsv8baegCeMPT1 u7tQcF7BEpsU0FjRH4tZWnk= =MiqD -----END PGP SIGNATURE-----
--- End Message ---
