Date: Thu, 6 Oct 2016 18:58:54 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Sean Bruno <sbruno@freebsd.org> Cc: freebsd-current@freebsd.org Subject: Re: Large patch/diff refuses to apply Message-ID: <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org> In-Reply-To: <e000a757-7d6d-2203-7aa6-8c71b7d84d2d@freebsd.org> References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> <20161006142339.GF6177@zxy.spb.ru> <a15d4a57-5a43-09c4-1535-ce68f716c93c@freebsd.org> <CAOtMX2gHRDE73csXK78E3XnPNTjSCw_zXAiSY_fP=iRw-EewGg@mail.gmail.com> <f312318f-4ebe-0917-cab9-ff7d7e200759@freebsd.org> <e000a757-7d6d-2203-7aa6-8c71b7d84d2d@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_4E68803B-5D0F-4AD7-9985-47B66CB34A49 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 06 Oct 2016, at 17:23, Sean Bruno <sbruno@freebsd.org> wrote: > > On 10/06/16 09:19, Sean Bruno wrote: >> >> On 10/06/16 09:00, Alan Somers wrote: >>> On Thu, Oct 6, 2016 at 8:41 AM, Sean Bruno <sbruno@freebsd.org> wrote: >>>> >>>> On 10/06/16 08:23, Slawa Olhovchenkov wrote: >>>>> On Thu, Oct 06, 2016 at 07:57:57AM -0600, Sean Bruno wrote: ... > A good example of what I was trying to do: > svn mkdir sys/modules/ix/ix_iflib > svn cp sys/modules/ix/Makefile sys/modules/ix/ix/ix_iflib/Makefile > <edit sys/modules/ix/ix_iflib/Makefile> > > That seems to really confuse things. Try using: svn diff --show-copies-as-adds -Dimitry --Apple-Mail=_4E68803B-5D0F-4AD7-9985-47B66CB34A49 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.30 iEYEARECAAYFAlf2gtMACgkQsF6jCi4glqPxpACeNyMIOEAJYu+WJyr8GnrS4NVB EVYAoPxYFtfAedmxvBoZNpPqUky3NaiB =6NIa -----END PGP SIGNATURE----- --Apple-Mail=_4E68803B-5D0F-4AD7-9985-47B66CB34A49--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1>