From owner-svn-src-head@FreeBSD.ORG Thu Jun 9 16:48:32 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 20F08106564A; Thu, 9 Jun 2011 16:48:32 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 945738FC0A; Thu, 9 Jun 2011 16:48:31 +0000 (UTC) Received: by gxk28 with SMTP id 28so1304979gxk.13 for ; Thu, 09 Jun 2011 09:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=k6mb48bYiHALS2PNfvmwr0Y6CjVdXc/uMi4PhvEVlDc=; b=Mdnr8PLKTyWmnESURwTkCyAjFoHHrCtdTdeeUyY1pv97RPrQ6uVdW1KnDxxlljNo8e ffIzGIj3Upb8RHssL6unoD4CIGFrcwAghJ8zrEvX6mVdIgc2/v02YDVW8cy8JoulqRxf P12CyOLk6jtwfZe0SJ9/NHEdykLp1nGf0kHXI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=iBvnA8N0CxnJeER+mQo5lBatSCPdYQo6zL8ZOuGFgh2IGjKjHVqUVgyTlUR6ebAaty REy0irKP1alOIyCx5aLr7SeZiT0IRu8BsLK0QG1/Hbozvt7TpF0Hoeu6YW1AeohL11bk 1bzjNheAF3y7CS8tdao87a9jTrO4/Y/KxDaFE= MIME-Version: 1.0 Received: by 10.236.109.19 with SMTP id r19mr1232364yhg.289.1307638110787; Thu, 09 Jun 2011 09:48:30 -0700 (PDT) Sender: asmrookie@gmail.com Received: by 10.236.67.81 with HTTP; Thu, 9 Jun 2011 09:48:30 -0700 (PDT) In-Reply-To: <201106090843.28669.jhb@freebsd.org> References: <201106070846.p578kD4K073476@svn.freebsd.org> <201106090843.28669.jhb@freebsd.org> Date: Thu, 9 Jun 2011 12:48:30 -0400 X-Google-Sender-Auth: R5o6ewcDSsAQjftdn-wXzN1SVQQ Message-ID: From: Attilio Rao To: John Baldwin Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: 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 16:48:32 -0000 2011/6/9 John Baldwin : > On Tuesday, June 07, 2011 4:46:13 am Attilio Rao wrote: >> Author: attilio >> Date: Tue Jun =C2=A07 08:46:13 2011 >> New Revision: 222813 >> URL: http://svn.freebsd.org/changeset/base/222813 >> >> Log: >> =C2=A0 etire the cpumask_t type and replace it with cpuset_t usage. >> >> Replaced: >> =C2=A0 head/share/man/man4/geom_map.4 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/share/man/man4/geom_map.4 >> =C2=A0 head/sys/dev/iicbus/ad7417.c >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/sys/dev/iicbus/ad7417.c >> =C2=A0 head/sys/nfs/nfs_kdtrace.h >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/sys/nfs/nfs_kdtrace.h >> =C2=A0 head/sys/sys/_stdint.h >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, projects/largeSMP/s= ys/sys/_stdint.h >> =C2=A0 head/tools/build/options/WITHOUT_GPIO >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/build/options/WITHOUT_GPIO >> =C2=A0 head/tools/build/options/WITH_OFED >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/build/options/WITH_OFED >> =C2=A0 head/tools/regression/bin/sh/builtins/set1.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/builtins/set1.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote1.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote1.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote2.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote2.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote3.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote3.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote4.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote4.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote5.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote5.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote6.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote6.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote7.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote7.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote8.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote8.0 >> =C2=A0 head/tools/regression/bin/sh/parser/dollar-quote9.0 >> =C2=A0 =C2=A0 =C2=A0- copied unchanged from r222812, > projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote9.0 > > It would appear that svn destroyed the history on all these files. =C2=A0= I suspect > svn merge --reintegrate is too broken to be used safely and should probab= ly > not be used in the future until/unless svn fixes it to not suck. That was suggested by re@ officials, so I can't really argue :) What would you use instead? the "write me" option? > I suspect this is related to the manual fixups Attilio did in the largeSM= P > branch for merges that didn't quite work right (I know sys/_stdint.h was = one > such file) and that the manual fixups confused svn when it came time to d= o > the merge. BINGO John, I completely forgot about it, but that may be the cause. Thanks, Attilio --=20 Peace can only be achieved by understanding - A. Einstein