From owner-svn-src-stable-8@FreeBSD.ORG Tue Nov 24 20:31:44 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 A3E791065670; Tue, 24 Nov 2009 20:31:44 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtpout028.mac.com (asmtpout028.mac.com [17.148.16.103]) by mx1.freebsd.org (Postfix) with ESMTP id 881248FC0A; Tue, 24 Nov 2009 20:31:44 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=us-ascii Received: from macbook-pro.jnpr.net (natint3.juniper.net [66.129.224.36]) by asmtp028.mac.com (Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008; 32bit)) with ESMTPSA id <0KTM00LO1ROSWJ20@asmtp028.mac.com>; Tue, 24 Nov 2009 12:31:44 -0800 (PST) From: Marcel Moolenaar In-reply-to: <200911241510.57232.jhb@freebsd.org> Date: Tue, 24 Nov 2009 12:31:40 -0800 Message-id: <39B700FA-6C21-4A7C-9375-E67AC9EC16EF@mac.com> References: <200911240317.nAO3H0P6003552@svn.freebsd.org> <200911241432.50925.jhb@freebsd.org> <200911241510.57232.jhb@freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.1077) 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:31:44 -0000 On Nov 24, 2009, at 12:10 PM, John Baldwin wrote: > 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. Thanks, I appreciate it! -- Marcel Moolenaar xcllnt@mac.com