On 31 Mar 2015, at 20:13, Dimitry Andric <d...@freebsd.org> wrote: ... > but then: > > + patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: contrib/libc++/include/type_traits > |=================================================================== > |--- contrib/libc++/include/type_traits (revision 280762) > |+++ contrib/libc++/include/type_traits (working copy) > -------------------------- > Patching file contrib/libc++/include/type_traits using Plan A... > Reversed (or previously applied) patch detected! Assume -R? [y] > Hunk #1 succeeded at 842. > Hunk #2 succeeded at 877. > Hmm... Ignoring the trailing garbage. > done > > E.g., it undoes the change to type_traits that was merged in the subversion > update.
Btw, please use patch -f for this, so it will error out, instead of accidentally reversing a patch. -Dimitry
signature.asc
Description: Message signed with OpenPGP using GPGMail
