Date: Thu, 6 Oct 2016 15:37:30 -0600 From: Sean Bruno <sbruno@freebsd.org> To: Dimitry Andric <dim@FreeBSD.org> Cc: freebsd-current@freebsd.org Subject: Re: Large patch/diff refuses to apply Message-ID: <ad28f88d-5b13-2386-2330-eeed74150f85@freebsd.org> In-Reply-To: <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@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> <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Ch0l037S8pm9N0lB0oTjKDfPEQaqiQCcM Content-Type: multipart/mixed; boundary="k72U7Tq0J9CGGRNbWvOKJGiD41tLwgfAO" From: Sean Bruno <sbruno@freebsd.org> To: Dimitry Andric <dim@FreeBSD.org> Cc: freebsd-current@freebsd.org Message-ID: <ad28f88d-5b13-2386-2330-eeed74150f85@freebsd.org> Subject: Re: Large patch/diff refuses to apply 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> <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org> In-Reply-To: <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org> --k72U7Tq0J9CGGRNbWvOKJGiD41tLwgfAO Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/06/16 10:58, Dimitry Andric wrote: > 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> wrot= e: >>>>> >>>>> 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. >=20 > Try using: svn diff --show-copies-as-adds >=20 > -Dimitry >=20 Most of what I was trying to do was with arcanist. The review generation seemed to be fine, but applying the diff from arcanist seemed to blow up. sean --k72U7Tq0J9CGGRNbWvOKJGiD41tLwgfAO-- --Ch0l037S8pm9N0lB0oTjKDfPEQaqiQCcM 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 iQF8BAEBCgBmBQJX9sQaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kdNAH+weCPqA+yV6mjA7GSFHvSxid EX4D27EIjvw8B5HcxZcWvirqObyY9MJDUsc4zQ5PTRedc6WH4+j31eGMbcQiNmAT YEln2qmI9tJfZN7Ow9u8z1U5bkZderCxxMOiT8n6pykqhZf8VYLllQTN7NXVznHL 5s2eBAJ8/BdVGaryFezrfvd8YSSBWvzhGvxS2X+kjoZehVMNKHBCVK+eFQtVylWf PtqkLkRjiYRUxJJwh+ZpZaBvsaPP0IANEIQpXGSUnhhHsYy46mM7zVefJkrcB6LF A1I12GKyDX3uGv5qw4HLBBOUFgyQwGAHkgBHpTCle7/iVrVTP6XkSQU8E/YeYUU= =gR0q -----END PGP SIGNATURE----- --Ch0l037S8pm9N0lB0oTjKDfPEQaqiQCcM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ad28f88d-5b13-2386-2330-eeed74150f85>