Date: Thu, 6 Oct 2016 07:57:57 -0600 From: Sean Bruno <sbruno@freebsd.org> To: freebsd-current <freebsd-current@freebsd.org> Subject: Large patch/diff refuses to apply Message-ID: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --x9owcww2F95XSlhBkaUAt6G5ax7mOf8Sf Content-Type: multipart/mixed; boundary="L5H2pnhjK8RFn3fgHcReVrb650D2KWBbb" From: Sean Bruno <sbruno@freebsd.org> To: freebsd-current <freebsd-current@freebsd.org> Message-ID: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> Subject: Large patch/diff refuses to apply --L5H2pnhjK8RFn3fgHcReVrb650D2KWBbb Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I'm doing a large amount of change to ixgbe(4) in support of IFLIB implementations and running into failures when trying to apply large diffs. This is causing phabricator reviews to be unuseable as well. I've setup two trees to test this. The first tree is used to generate the diff and the second (vanilla) is used to apply the diff. The entire patch fails to apply, so I'm assuming that the size of the diff is failing because of a sanity check or something. https://people.freebsd.org/~sbruno/test.diff % svn stat sys/dev/ixgbe/if_ix.c M sys/dev/ixgbe/if_ix.c % svn diff sys/dev/ixgbe/if_ix.c > ~/test.diff % cd ../vanilla/ % patch -p0 < ~/test.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/dev/ixgbe/if_ix.c |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- sys/dev/ixgbe/if_ix.c (revision 306673) |+++ sys/dev/ixgbe/if_ix.c (working copy) -------------------------- Patching file sys/dev/ixgbe/if_ix.c using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to sys/dev/ixgbe/if_ix.c.rej done % ls -l sys/dev/ixgbe/if_ix.c* -rw-r--r-- 1 sbruno wheel 166692 Oct 6 06:41 sys/dev/ixgbe/if_ix.c -rw-r--r-- 1 sbruno wheel 166692 Oct 6 06:37 sys/dev/ixgbe/if_ix.c.or= ig -rw-r--r-- 1 sbruno wheel 172779 Oct 6 06:41 sys/dev/ixgbe/if_ix.c.re= j % svn stat sys/dev/ixgbe/ ? sys/dev/ixgbe/if_ix.c.orig --L5H2pnhjK8RFn3fgHcReVrb650D2KWBbb-- --x9owcww2F95XSlhBkaUAt6G5ax7mOf8Sf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJX9lhmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kCVIH/3+ju586fjpfhy/ODPUWMSK+ rp4LZQr2CP+WhQcCDxLjHCD0R5bb+D+gD0ixHZ7Ux3sQUEjtYiwPFiCo61N9ZimR M/AD1ZfTT0Q/GTW03KjUfOe7K1jmz18g50T/wajIfmwqRXco8QVsJ5gOZUrLFSn0 dfgfBJLXGXoZL7Eixkso0FPnH45LTnmLKIJ3aJ5302Cc70znIQfDYlF1ILB/7vfG ff1hjj27YXla5bIoD9ZrN723XZWOE6tY84QEA54hzuEyHyA56YYvk8GBkJ8Y1sdF xE+4d0UytnxZMqdlSwetDjVdUbJ6HUK9Jj3YmoI4f346vqYu21Dx02hHbxkeiJM= =0zvq -----END PGP SIGNATURE----- --x9owcww2F95XSlhBkaUAt6G5ax7mOf8Sf--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?abd48514-c699-888d-1ba3-f6e4a8f7f05c>