Hi,
Here is a Debian bug (#443428, http://bugs.debian.org/443428 )
In the Debian package, I applied the patch in attachment that check
that hgmerge has 3 arguments. You might want to apply similar patch
upstream or a better patch that does more checks (check arguments are
correct filenames, ...) or that print a better error message.
Best regards
Vincent
Alexandre Fayolle wrote:
> Package: mercurial
> Version: 0.9.4-1
> Severity: minor
>
> Hi,
>
> The last 3 lines of the output of hgmerge --help are
>
> Report bugs to <[EMAIL PROTECTED]>.
> cp: unrecognized option `--help.orig.238627774'
> Try `cp --help' for more information.
>
> Similar issue with a french locale.
>
> Regards
>
> -- System Information:
> Debian Release: lenny/sid
> APT prefers unstable
> APT policy: (500, 'unstable'), (500, 'stable')
> Architecture: i386 (i686)
>
> Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core)
> Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/bash
>
> Versions of packages mercurial depends on:
> ii libc6 2.6.1-5 GNU C Library: Shared libraries
> ii python 2.4.4-6 An interactive high-level
> object-o
> ii python-support 0.6.4 automated rebuilding support for
> p
> ii python2.5 2.5.1-5 An interactive high-level
> object-o
>
> Versions of packages mercurial recommends:
> pn kdiff3 | tkdiff | rcs <none> (no description available)
> ii tk8.4 [wish] 8.4.15-2 Tk toolkit for Tcl and X11, v8.4
> -
>
> -- no debconf information
>
>
fix bug #443428
Index: mercurial-0.9.5/hgmerge
===================================================================
--- mercurial-0.9.5.orig/hgmerge 2007-10-28 21:29:23.000000000 +0100
+++ mercurial-0.9.5/hgmerge 2007-10-28 21:31:47.000000000 +0100
@@ -13,6 +13,11 @@
set -e # bail out quickly on failure
+if [ $# != 3 ]; then
+ echo "Invalid usage of hgmerge. Check manpage" 1>&2
+ exit 1
+fi
+
LOCAL="$1"
BASE="$2"
OTHER="$3"
