From owner-svn-src-all@FreeBSD.ORG Thu Jun 9 12:43:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74CAA106564A; Thu, 9 Jun 2011 12:43:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 329618FC08; Thu, 9 Jun 2011 12:43:30 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id A9E6C46B42; Thu, 9 Jun 2011 08:43:29 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 36FCC8A01F; Thu, 9 Jun 2011 08:43:29 -0400 (EDT) From: John Baldwin To: Attilio Rao Date: Thu, 9 Jun 2011 08:43:28 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110325; KDE/4.5.5; amd64; ; ) References: <201106070846.p578kD4K073476@svn.freebsd.org> In-Reply-To: <201106070846.p578kD4K073476@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201106090843.28669.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Thu, 09 Jun 2011 08:43:29 -0400 (EDT) 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2011 12:43:30 -0000 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 > > Log: > etire the cpumask_t type and replace it with cpuset_t usage. > > Replaced: > head/share/man/man4/geom_map.4 > - copied unchanged from r222812, projects/largeSMP/share/man/man4/geom_map.4 > head/sys/dev/iicbus/ad7417.c > - copied unchanged from r222812, projects/largeSMP/sys/dev/iicbus/ad7417.c > head/sys/nfs/nfs_kdtrace.h > - copied unchanged from r222812, projects/largeSMP/sys/nfs/nfs_kdtrace.h > head/sys/sys/_stdint.h > - copied unchanged from r222812, projects/largeSMP/sys/sys/_stdint.h > head/tools/build/options/WITHOUT_GPIO > - copied unchanged from r222812, projects/largeSMP/tools/build/options/WITHOUT_GPIO > head/tools/build/options/WITH_OFED > - copied unchanged from r222812, projects/largeSMP/tools/build/options/WITH_OFED > head/tools/regression/bin/sh/builtins/set1.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/builtins/set1.0 > head/tools/regression/bin/sh/parser/dollar-quote1.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote1.0 > head/tools/regression/bin/sh/parser/dollar-quote2.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote2.0 > head/tools/regression/bin/sh/parser/dollar-quote3.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote3.0 > head/tools/regression/bin/sh/parser/dollar-quote4.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote4.0 > head/tools/regression/bin/sh/parser/dollar-quote5.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote5.0 > head/tools/regression/bin/sh/parser/dollar-quote6.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote6.0 > head/tools/regression/bin/sh/parser/dollar-quote7.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote7.0 > head/tools/regression/bin/sh/parser/dollar-quote8.0 > - copied unchanged from r222812, projects/largeSMP/tools/regression/bin/sh/parser/dollar-quote8.0 > head/tools/regression/bin/sh/parser/dollar-quote9.0 > - 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. 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. I suspect this is related to the manual fixups Attilio did in the largeSMP 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 do the merge. -- John Baldwin