hg import failure under solaris 8

Matt Mackall mpm at selenic.com
Thu Dec 15 04:24:58 UTC 2005


On Wed, Dec 14, 2005 at 05:32:47PM +0100, PATUREL Gilles wrote:
> Hi,
> 
> I would like to convince my hierarchy to migrate from teamware to mercurial (0.7) and,
> according to our development process (based on patches), it appears that import/export
> would be the best method of publication. Unfortunately, the import command fails :
> 
> $ uname -a
> SunOS osiris 5.8 Generic_117350-26 sun4u sparc SUNW,Sun-Fire-V440
> 
> $ diff --version
> diff (GNU diffutils) 2.8.1
> 
> $ python -V
> Python 2.4.2
> 
> $ cat mypatch
> # HG changeset patch
> # User sumadm at osiris
> # Node ID d8756c1a1c61c59e067d9016886e4d1186594c5e
> # Parent  56660216aa727767b5d8d10e1687e4b9203075a4
> DEVELOPPEMENTS TERMINES
> 
> diff -r 56660216aa72 -r d8756c1a1c61 .hgtags
> --- /dev/null   Tue Dec 13 10:57:27 2005
> +++ b/.hgtags   Tue Dec 13 10:57:59 2005
> @@ -0,0 +1,1 @@
> +56660216aa727767b5d8d10e1687e4b9203075a4 DEVTAG
> 
> $ hg import ../mypatch
> applying ../mypatch
>   Ressemble ? une op?ration context diff unifi?e.
> Fichier auquel appliquer le patch : [PROMPT]
> 
> 
> "Seems to be a context unified diff operation" - "File to apply the patch on : ?"

What happens when you run patch manually? We're doing this (from
util.py: 76):

    fp = os.popen('patch -p%d < "%s"' % (strip, patchname))

Strip defaults to 1.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial mailing list