[Python-apps-team] Bug#481089: mercurial: Unexpected change in hg merge behavior

[Ilya Martynov]

Package: mercurial
Version: 1.0-4
Severity: minor


Before upgrade from 0.9.5-3 hg merge used to invoke kdiff3
automatically for me when resolving conflicts. Since the upgrade it
doesn't do this anymore and I had to explicitly configure kdiff3 as a
merge tool in my $HOME/.hgrc to get back the old behavior.

I think that either default config in /etc/mercurial should be changed
to support old behavior - i.e. run kdiff3 or other graphical merge
tools which are listed as suggested for the package if they are
present and if hg is running under X11. Or at least this change should
be reflected in NEWS.Debian.

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-686 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=ru_RU.UTF8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages mercurial depends on:
ii  libc6                         2.7-10     GNU C Library: Shared libraries
ii  mercurial-common              1.0-4      Scalable distributed version contr
ii  python                        2.5.2-1    An interactive high-level object-o
ii  python-support                0.7.7      automated rebuilding support for P
ii  ucf                           3.006      Update Configuration File: preserv

Versions of packages mercurial recommends:
ii  kdiff3                        0.9.92-2   compares and merges 2 or 3 files o
ii  meld                          1.1.5.1-2  graphical tool to diff and merge f

-- no debconf information