From owner-freebsd-current@freebsd.org  Thu Oct  6 16:59:11 2016
Return-Path: <owner-freebsd-current@freebsd.org>
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 5059BAF6CBD
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Thu,  6 Oct 2016 16:59:11 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (tensor.andric.com [87.251.56.140])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "tensor.andric.com",
 Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 06D68DB7;
 Thu,  6 Oct 2016 16:59:10 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from [10.192.1.157] (unknown [178.20.50.10])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by tensor.andric.com (Postfix) with ESMTPSA id BBF2A3C603;
 Thu,  6 Oct 2016 18:59:01 +0200 (CEST)
Subject: Re: Large patch/diff refuses to apply
Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
Content-Type: multipart/signed;
 boundary="Apple-Mail=_4E68803B-5D0F-4AD7-9985-47B66CB34A49";
 protocol="application/pgp-signature"; micalg=pgp-sha1
X-Pgp-Agent: GPGMail 2.6.1
From: Dimitry Andric <dim@FreeBSD.org>
In-Reply-To: <e000a757-7d6d-2203-7aa6-8c71b7d84d2d@freebsd.org>
Date: Thu, 6 Oct 2016 18:58:54 +0200
Cc: freebsd-current@freebsd.org
Message-Id: <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>
To: Sean Bruno <sbruno@freebsd.org>
X-Mailer: Apple Mail (2.3124)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Oct 2016 16:59:11 -0000


--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--