Your message dated Sun, 24 Feb 2013 04:47:31 +0000 with message-id <[email protected]> and subject line Bug#701168: fixed in mercurial 2.2.2-3 has caused the Debian Bug report #701168, regarding mercurial: Backport improvement to vimdiff configuration 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.) -- 701168: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701168 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: mercurial Version: 2.2.2-2 Severity: important Tags: patch During a merge conflict, vimdiff is very likely to be picked as the default mergetool. This have two majors issues 1) People tends to panic and just quit vimdiff. Vimdiff exit with a 0 returns code and Mercurial see the conflict as resolved when nothing have been done. Ignoring change from on side of the merge. We configure vimdiff with vimdiff.check=changed to detect this situation. If the file did not changed we ask the user if the conflict have been resolve. 2) People tends to not know whats going on and how to get out of vimdiff. We configure vimdiff so display a message when launched hg merge conflict, type ":cq" to abort vimdiff As a bonus it teach people the ":cq" command that quit vimdiff with a non-zero exit code. Informing Mercurial that the conflict is unresolved. The previous configuration led to multiple and regular data loss. I would like this config to be backported in wheezy. Here is the patch to apply to mergetool.rc --- /etc/mercurial/hgrc.d/mergetools.rc 2011-09-12 22:38:01.000000000 +0200 +++ /tmp/mergetools.hgrc 2013-02-22 12:01:19.628259820 +0100 @@ -15,7 +15,8 @@ gvimdiff.regname=path gvimdiff.priority=-9 -vimdiff.args=$local $other $base +vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl' +vimdiff.check=changed vimdiff.priority=-10 merge.checkconflicts=True -- System Information: Debian Release: 6.0.6 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/16 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -- Pierre-Yves David http://www.logilab.fr/
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---Source: mercurial Source-Version: 2.2.2-3 We believe that the bug you reported is fixed in the latest version of mercurial, which is due to be installed in the Debian FTP archive. 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. Javi Merino <[email protected]> (supplier of updated mercurial 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: Sat, 23 Feb 2013 19:52:22 +0000 Source: mercurial Binary: mercurial-common mercurial Architecture: source all i386 Version: 2.2.2-3 Distribution: unstable Urgency: low Maintainer: Python Applications Packaging Team <[email protected]> Changed-By: Javi Merino <[email protected]> Description: mercurial - easy-to-use, scalable distributed version control system mercurial-common - easy-to-use, scalable distributed version control system (common Closes: 701168 Changes: mercurial (2.2.2-3) unstable; urgency=low . * Fix "Backport improvement to vimdiff configuration" by adding from_upstream__set_vimdiff_to_check_changed.patch, from_upstream__mergetools_vimdiff_issue_warning.patch and from_upstream__mergetools_refine_vimdiff_warning_message.patch backported from upstream (Closes: #701168) Checksums-Sha1: 092c233b4bc610b270c02bf5d698e4fa5f100706 1513 mercurial_2.2.2-3.dsc 9188e70eef153bf44ce3a1ff1615c81bff3b6aac 38570 mercurial_2.2.2-3.debian.tar.gz 4eb088ae4595e74445698cf53905c72660e2ca9c 2320074 mercurial-common_2.2.2-3_all.deb 8c7b817a69947fdbc1cf826bb63bdd902fb1e08c 89086 mercurial_2.2.2-3_i386.deb Checksums-Sha256: 3775286a69b5559191773c8a1c0a3b6f81f9efdf82928ca05437221dbe6cef4e 1513 mercurial_2.2.2-3.dsc 999ffc6add14981110f6e9652366065205e431127530d34b23a85b7e70ee3133 38570 mercurial_2.2.2-3.debian.tar.gz 40da6629aa834ab5ddc4920ca6fb4fbed802e7a9e1c8f4eb55e9a28f29d5e0f5 2320074 mercurial-common_2.2.2-3_all.deb 703e277292e6e6955ca8f1a60e34a349997635d304e8027598af0c3ba5abb162 89086 mercurial_2.2.2-3_i386.deb Files: 05fe762bb846d9123e3cdfa4b1800f21 1513 vcs optional mercurial_2.2.2-3.dsc 822cdebeaf3f56941a2882a1bf8a7827 38570 vcs optional mercurial_2.2.2-3.debian.tar.gz 6a1d268e5d838c44202d06274f641cc7 2320074 vcs optional mercurial-common_2.2.2-3_all.deb cbd2089294fab4c56679b9c88374e2c3 89086 vcs optional mercurial_2.2.2-3_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlEpl40ACgkQLc4/KDbU5PXRAgCdF4ACMG+UocbxCGeWNBOqtXxB NbEAoIxsQADDfwFRpR08vysyBx2wXm51 =vXZa -----END PGP SIGNATURE-----
--- End Message ---
