From owner-svn-src-stable-8@FreeBSD.ORG Tue Nov 24 20:11:03 2009 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A64B41065676; Tue, 24 Nov 2009 20:11:03 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 7475F8FC28; Tue, 24 Nov 2009 20:11:03 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 2B34246B1A; Tue, 24 Nov 2009 15:11:03 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 67DE98A01B; Tue, 24 Nov 2009 15:11:02 -0500 (EST) From: John Baldwin To: Marcel Moolenaar Date: Tue, 24 Nov 2009 15:10:57 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20091103; KDE/4.3.1; amd64; ; ) References: <200911240317.nAO3H0P6003552@svn.freebsd.org> <200911241432.50925.jhb@freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200911241510.57232.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 24 Nov 2009 15:11:02 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Marcel Moolenaar , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Max Laier Subject: Re: svn commit: r199729 - stable/8/sys/ia64/include X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 20:11:04 -0000 On Tuesday 24 November 2009 2:55:53 pm Marcel Moolenaar wrote: > *snip* > > >>>>> 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. > >> > >> *sigh* > >> > >> I can't keep up with this... > > > > Generally you can just commit whatever svn merge gives you. Having a few > > extra properties in the kernel tree is "normal" for stable/[678]. (I think > > stable/6 only has one extra: contrib/pf). I do try to clean up merges into > > the wrong directories, but in the case of vendor merges there isn't anything > > to clean unless we reorganize the vendor-sys trees so that they always merge > > to sys. > > Do you want me to --record-only what I pruned or can we leave it > as is with the note not to prune? You can just leave it as it is in this case I think. In the cases when I do find mergeinfo that I can prune I will generally find missing info like this and fix it up when doing the prune. -- John Baldwin