patch on freebsd
Brad Schick
schickb at gmail.com
Wed Aug 15 04:33:09 UTC 2007
I have mercurial 0.9.4 installed in a local account on FreeBSD
6.2-RELEASE. So far it works except for patch. Anyone know the trick for
making hg happy with freebsd's patch?
When I set patch to "gpatch" in my .hgrc I get:
$ hg debuginstall -v
Checking encoding (US-ASCII)...
Checking extensions...
Checking templates...
Checking patch...
NAME
gpatch - Apply a gdiff patch to a file
SYNOPSIS
gpatch source diff > target
DESCRIPTION
Applies a gdiff patch to a file returning the patched file on standard
out.
AUTHOR
Brian Schroeder (gdiff at brian-schroeder.de)
Zed Shaw (Who implemented the perfect suffix tree algorithms)
SEE ALSO
gdiff
patch call failed:
patch command failed: exited with status 1
Checking merge helper...
Checking commit editor...
Checking username...
1 problems detected, please check your install!
When I set patch to "patch" in my .hgrc I get:
$ hg debuginstall -v
Checking encoding (US-ASCII)...
Checking extensions...
Checking templates...
Checking patch...
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- a/tmptHSSFV None
|+++ b/tmptHSSFV None
--------------------------
Patching file tmptHSSFV using Plan A...
Hunk #1 succeeded at 1.
done
unexpected patch output! (you may have an incompatible version of patch)
Checking merge helper...
Checking commit editor...
Checking username...
1 problems detected, please check your install!
I tried "patch --silent" but that didn't help.
-Brad
More information about the Mercurial
mailing list