From: Carlo M. A. B. <ca...@sa...> - 2008-06-11 23:51:10
|
On Wed, Jun 11, 2008 at 02:51:44PM -0700, Bernard Li wrote: > > Doesn't look it applies cleanly to the 3.1.x branch: > > # patch -p0 --dry-run < ganglia-3.1-bootstrap-noauto.patch > patching file libmetrics/bootstrap > patching file bootstrap > Hunk #1 FAILED at 1. > 1 out of 2 hunks FAILED -- saving rejects to file bootstrap.rej the patch was generated using svn from a patched 3.1 branch, but `patch` won't be able to identify and correct the conflict generated by the expansion of "$Id: $", and so that patch won't apply cleanly using it as you reported. my bad, wasn't expecting it to be used that way but if you want to use patch to apply it to your branch from this email then use the attached file instead (will need -p1). for a snapshot that was generated in CentOS 4.6 using this patched ganglia-3.1 branch and that is otherwise equivalent to the one you published (except that it will work in DragonFlyBSD) go to : http://tapir.sajinet.com.pe/ganglia/ganglia-3.1.0.1399.tar.gz Carlo |