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...

[Attilio Rao]

2011/6/9 John Baldwin <jhb at freebsd.org>:
> 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.

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 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.

BINGO John, I completely forgot about it, but that may be the cause.

Thanks,
Attilio


-- 
Peace can only be achieved by understanding - A. Einstein