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