From: Roberto Nibali <ratz@drugphish.ch>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: git@vger.kernel.org, junkio@cox.net
Subject: Re: [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found.
Date: Mon, 30 Jan 2006 00:42:13 +0100 [thread overview]
Message-ID: <43DD52D5.8080003@drugphish.ch> (raw)
In-Reply-To: <20060129121608.GC4815@c165.ib.student.liu.se>
> - [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
next prev parent reply other threads:[~2006-01-29 23:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-28 10:53 No merge strategy handled the merge (git version 1.1.GIT) Roberto Nibali
2006-01-29 12:03 ` Fredrik Kuivinen
2006-01-29 12:16 ` [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found Fredrik Kuivinen
2006-01-29 23:42 ` Roberto Nibali [this message]
2006-01-29 12:23 ` No merge strategy handled the merge (git version 1.1.GIT) Radoslaw Szkodzinski
2006-01-29 12:32 ` Radoslaw Szkodzinski
2006-01-29 23:42 ` Roberto Nibali
2006-01-29 23:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43DD52D5.8080003@drugphish.ch \
--to=ratz@drugphish.ch \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).