Re: [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found.

From: Roberto Nibali <ratz@drugphish.ch>
Date: Jan 29, 2006, 23:42 UTC
Message-ID: <43DD52D5.8080003@drugphish.ch>
In-Reply-To: <20060129121608.GC4815@c165.ib.student.liu.se>

Show 15 quoted lines

> -            [out, code] = runProgram(['merge',
> -                                      '-L', branch1Name + '/' + aPath,
> -                                      '-L', 'orig/' + oPath,
> -                                      '-L', branch2Name + '/' + bPath,
> -                                      src1, orig, src2], returnCode=True)
> +            try:
> +                [out, code] = runProgram(['merge',
> +                                          '-L', branch1Name + '/' + aPath,
> +                                          '-L', 'orig/' + oPath,
> +                                          '-L', branch2Name + '/' + bPath,
> +                                          src1, orig, src2], returnCode=True)
> +            except ProgramError, e:
> +                print >>sys.stderr, e
> +                die("Failed to execute 'merge'. merge(1) is used as the "
> +                    "file-level merge tool. Is 'merge' in your path?")

This has my vote as well.

Thanks for your support, Roberto Nibali, ratz

-- 
echo 
'[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc