From owner-svn-src-stable-9@FreeBSD.ORG Sat Nov 5 22:23:51 2011 Return-Path: Delivered-To: svn-src-stable-9@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82FF3106564A; Sat, 5 Nov 2011 22:23:51 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net [IPv6:2001:7b8:2ff:146::2]) by mx1.freebsd.org (Postfix) with ESMTP id 45FE38FC18; Sat, 5 Nov 2011 22:23:51 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7:0:5502:9023:fa7c:ca0f] (unknown [IPv6:2001:7b8:3a7:0:5502:9023:fa7c:ca0f]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 62A4A5C59; Sat, 5 Nov 2011 23:23:50 +0100 (CET) Message-ID: <4EB5B776.7090205@FreeBSD.org> Date: Sat, 05 Nov 2011 23:23:50 +0100 From: Dimitry Andric Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:8.0) Gecko/20111031 Thunderbird/8.0 MIME-Version: 1.0 To: Andriy Gapon References: <4EB55B99.2000308@FreeBSD.org> In-Reply-To: <4EB55B99.2000308@FreeBSD.org> Content-Type: text/plain; charset=x-viet-vps Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-9@FreeBSD.org Subject: Re: mergeinfo under sys/boot? X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2011 22:23:51 -0000 On 2011-11-05 16:51, Andriy Gapon wrote: > Looks like we have mergeinfo property on a bunch of files under sys/boot in head > and stable/9. > At least the following are affected: > sys/boot/powerpc/boot1.chrp > sys/boot/powerpc/ofw > sys/boot/i386/efi > ... > > Not sure if that mergeinfo is useful for anything. > It seems that it was added to head in r218822 ("Merge binutils 2.17.50 to head"). I think I had to add that mergeinfo there, because I made some changes in those directories to accomodate the new binutils version. As far as I remember, merging to sys/ itself caused some problems, so that is why I merged to the individual subdirectories instead. I guess this mergeinfo isn't really useful anymore, but I'd like to hear the opinion of the Subversion gurus first. :)