Package: xxdiff
Version: 1:3.1-1
Severity: normal
Tags: patch
$ svn diff --diff-cmd xxdiff-subversion
[...]
Error: unexpected answer from xxdiff: sh: /home/blais/p/xxdiff/bin/xxdiff: No
such file or directory
Patch attached.
-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.11.1
Locale: LANG=en_US.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Versions of packages xxdiff depends on:
ii libc6 2.3.2.ds1-20.0.0.1.pure64 GNU C Library: Shared libraries an
ii libgcc1 1:3.4.3-12 GCC support library
ii libqt3c102-mt 3:3.3.3-7 Qt GUI Library (Threaded runtime v
ii libstdc++5 1:3.3.5-12 The GNU Standard C++ Library v3
ii libx11-6 4.3.0.dfsg.1-10 X Window System protocol client li
ii libxext6 4.3.0.dfsg.1-10 X Window System miscellaneous exte
ii xlibs 4.3.0.dfsg.1-10 X Keyboard Extension (XKB) configu
-- no debconf information
--- /usr/bin/xxdiff-subversion 2005-03-24 20:45:22.000000000 -0700
+++ xxdiff-subversion 2005-03-25 15:09:31.000000000 -0700
@@ -88,7 +88,7 @@
tmpf = NamedTemporaryFile('rw', prefix=tmppfx)
# run command
- xxdiff_path = '/home/blais/p/xxdiff/bin/xxdiff'
+ xxdiff_path = 'xxdiff'
cmd = [xxdiff_path, '--decision']
if opts.merge:
cmd.append('--merge')