Date: Thu, 9 Jun 2011 08:43:28 -0400 From: John Baldwin <jhb@freebsd.org> To: Attilio Rao <attilio@freebsd.org> 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... Message-ID: <201106090843.28669.jhb@freebsd.org> In-Reply-To: <201106070846.p578kD4K073476@svn.freebsd.org> References: <201106070846.p578kD4K073476@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106090843.28669.jhb>