svn commit: r199729 - stable/8/sys/ia64/include

[John Baldwin]

On Monday 23 November 2009 11:17:00 pm Marcel Moolenaar wrote:
> On Nov 23, 2009, at 7:51 PM, Max Laier wrote:
> 
> >> Modified:
> >>  stable/8/sys/ia64/include/asm.h
> >> Directory Properties:
> >>  stable/8/sys/   (props changed)
> > 
> > These MFCs seem to be missing mergeinfo for the contrib directories.
> 
> I pruned them. We don't seem to get rid of merge into in the
> wrong directories even even people try to clean it up...

That was the wrong thing to do.  The mergeinfo on the contrib directories is 
actually quite valid b/c they have metadata from multiple locations.  These 
were not the results of merges into the wrong directories, but the results of 
merges from vendor trees into HEAD.

-- 
John Baldwin