From owner-svn-src-head@FreeBSD.ORG Thu Jun 9 21:37:31 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 60210106564A; Thu, 9 Jun 2011 21:37:31 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 17A8F8FC17; Thu, 9 Jun 2011 21:37:31 +0000 (UTC) Received: from [10.30.101.53] ([209.117.142.2]) (authenticated bits=0) by harmony.bsdimp.com (8.14.4/8.14.3) with ESMTP id p59LSUkL032513 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES128-SHA bits=128 verify=NO); Thu, 9 Jun 2011 15:28:33 -0600 (MDT) (envelope-from imp@bsdimp.com) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: Warner Losh In-Reply-To: <201106091352.04738.jhb@freebsd.org> Date: Thu, 9 Jun 2011 15:28:25 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: <1FCA7CC7-3B61-4379-96BB-6E8976B9983A@bsdimp.com> References: <201106070846.p578kD4K073476@svn.freebsd.org> <201106090843.28669.jhb@freebsd.org> <201106091352.04738.jhb@freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.1084) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (harmony.bsdimp.com [10.0.0.6]); Thu, 09 Jun 2011 15:28:34 -0600 (MDT) Cc: Attilio Rao , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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 21:37:31 -0000 On Jun 9, 2011, at 11:52 AM, John Baldwin wrote: > On Thursday, June 09, 2011 12:48:30 pm Attilio Rao wrote: >> 2011/6/9 John Baldwin : >>> On Tuesday, June 07, 2011 4:46:13 am Attilio Rao wrote: >>>> Author: attilio >>>> Date: Tue Jun 7 08:46:13 2011 >>>> New Revision: 222813 >>>> URL: http://svn.freebsd.org/changeset/base/222813 >>>>=20 >>> It would appear that svn destroyed the history on all these files. = I suspect >>> svn merge --reintegrate is too broken to be used safely and should = probably >>> not be used in the future until/unless svn fixes it to not suck. >>=20 >> That was suggested by re@ officials, so I can't really argue :) >=20 > Well, I don't think it has blown up in the past, so at the time that > recommendation was probably fine. >=20 >> What would you use instead? the "write me" option? >=20 > svn diff | patch (basically what folks do for branches in p4). BTW, I discovered similar things when I was doing the mips work on a = branch... svn is good for 'dolphin' branches, but not so good when you want to = cherry pick changes back to the main while you are also pulling changes = from the main. Warner