From owner-freebsd-current@freebsd.org Thu Oct 6 21:37:35 2016 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4AC7BEC06B for ; Thu, 6 Oct 2016 21:37:35 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 923DE1C58; Thu, 6 Oct 2016 21:37:35 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from [192.168.0.6] (97-123-129-224.albq.qwest.net [97.123.129.224]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 38A651928AD; Thu, 6 Oct 2016 21:37:34 +0000 (UTC) Subject: Re: Large patch/diff refuses to apply To: Dimitry Andric References: <20161006142339.GF6177@zxy.spb.ru> <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org> Cc: freebsd-current@freebsd.org From: Sean Bruno Message-ID: Date: Thu, 6 Oct 2016 15:37:30 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <5CAEF9E6-A5C2-40DC-ABCC-C146CA2E91A1@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Ch0l037S8pm9N0lB0oTjKDfPEQaqiQCcM" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2016 21:37:35 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Ch0l037S8pm9N0lB0oTjKDfPEQaqiQCcM Content-Type: multipart/mixed; boundary="k72U7Tq0J9CGGRNbWvOKJGiD41tLwgfAO" From: Sean Bruno To: Dimitry Andric Cc: freebsd-current@freebsd.org Message-ID: Subject: Re: Large patch/diff refuses to apply References: <20161006142339.GF6177@zxy.spb.ru> <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 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 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 >> >> >> 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--