From owner-svn-src-head@FreeBSD.ORG Thu Jun 9 19:35:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5839F106564A; Thu, 9 Jun 2011 19:35:34 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 14F208FC0C; Thu, 9 Jun 2011 19:35:34 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:2dae:f11:a41a:c0fe] (unknown [IPv6:2001:7b8:3a7:0:2dae:f11:a41a:c0fe]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 20ADE5C37; Thu, 9 Jun 2011 21:35:33 +0200 (CEST) Message-ID: <4DF12081.5050504@FreeBSD.org> Date: Thu, 09 Jun 2011 21:35:29 +0200 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.18pre) Gecko/20110527 Lanikai/3.1.11pre MIME-Version: 1.0 To: John Baldwin References: <201106070846.p578kD4K073476@svn.freebsd.org> <201106091352.04738.jhb@freebsd.org> <4DF115DF.4020501@FreeBSD.org> <201106091500.32540.jhb@freebsd.org> In-Reply-To: <201106091500.32540.jhb@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Attilio Rao , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andriy Gapon Subject: Re: svn commit: r222813 - in head: . contrib/top gnu/usr.bin/gdb/kgdb lib/libkvm lib/libmemstat share/man/man4 share/mk sys/amd64/acpica sys/amd64/amd64 sys/amd64/include sys/arm/arm sys/arm/include sy... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2011 19:35:34 -0000 On 2011-06-09 21:00, John Baldwin wrote: > On Thursday, June 09, 2011 2:50:07 pm Andriy Gapon wrote: >> on 09/06/2011 20:52 John Baldwin said the following: >>> svn diff | patch (basically what folks do for branches in p4). >> >> svn diff doesn't always produce a diff suitable for patch. >> I remember having to do diff -r... between two svn checkouts. > > Hmm, I think an svn diff between two URLs will generally DTRT though, > but you'll want your branch up to date to reduce noise in the diff. One problem is that svn diff does *not* expand $FreeBSD$ keywords, so feeding these diffs to patch usually leads to at least a few failed hunks. :)