[Python-apps-team] Bug#556659: mercurial: Default merge-tool not configured correctly

[Oliver Feiler]

Package: mercurial
Version: 1.3.1-1~bpo50+2
Severity: normal


Hello,

mercurial (from lenny backports) seems to be configured with vim's merge-tool by default. However on the 
standard install (apt-get -t lenny-backports install mercurial) when merging with hg this error is thrown:

This Vim was not compiled with the diff feature
merging some/path/some.file failed!

The resulting file does not have any conflict markers or any other markings detailing where the merge 
failed. This is major problem when dealing with failed merges in mercurial.

If the default install seems to depend on vim's diff feature by default it should have a dependency on it. 
Additionally the mercurial internal merge-tool should be used by default.

Kind regards,
Oliver Feiler


-- System Information: Debian Release: 5.0.3 This APT prefers stable  APT policy: (500, 'stable') Architecture: i386 (i686)

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

Versions of packages mercurial depends on:
ii  libc6                    2.7-18          GNU C Library: Shared libraries
ii  mercurial-common         1.3.1-1~bpo50+2 scalable distributed version contr
ii  python                   2.5.2-3         An interactive high-level object-o
ii  python-support           1.0.3~bpo50+1   automated rebuilding support for P
ii  ucf                      3.0016          Update Configuration File: preserv

mercurial recommends no packages.

Versions of packages mercurial suggests:
pn  kdiff3 | tkdiff | meld | xxdi <none>     (no description available)
pn  qct                           <none>     (no description available)
ii  tk8.4 [wish]                  8.4.19-2   Tk toolkit for Tcl and X11, v8.4 -
pn  vim | emacs                   <none>     (no description available)

-- no debconf information