From owner-svn-src-projects@FreeBSD.ORG Tue Oct 13 21:49:00 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BF39106568D; Tue, 13 Oct 2009 21:49:00 +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 6A8748FC12; Tue, 13 Oct 2009 21:49:00 +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 07F0746B1A; Tue, 13 Oct 2009 17:49:00 -0400 (EDT) Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 615D48A01D; Tue, 13 Oct 2009 17:48:59 -0400 (EDT) From: John Baldwin To: Lawrence Stewart Date: Tue, 13 Oct 2009 17:32:06 -0400 User-Agent: KMail/1.9.7 References: <200910132021.n9DKLHkj015399@svn.freebsd.org> <200910131706.36935.jhb@freebsd.org> <4AD4F095.1060306@freebsd.org> In-Reply-To: <4AD4F095.1060306@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200910131732.07310.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 13 Oct 2009 17:48:59 -0400 (EDT) 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: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r198048 - in projects/tcp_cc_8.x: . cddl/compat/opensolaris cddl/contrib/opensolaris cddl/lib/libnvpair contrib/bind9 contrib/bzip2 contrib/cpio contrib/csup contrib/ee contrib/file con... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2009 21:49:00 -0000 On Tuesday 13 October 2009 5:26:45 pm Lawrence Stewart wrote: > John Baldwin wrote: > > On Tuesday 13 October 2009 4:21:17 pm Lawrence Stewart wrote: > >> Author: lstewart > >> Date: Tue Oct 13 20:21:17 2009 > >> New Revision: 198048 > >> URL: http://svn.freebsd.org/changeset/base/198048 > >> > >> Log: > >> Remove all mergeinfo except on top level directory. It's not needed for my > >> project branch. > > > > Be extremely careful before merging this back up to stable/8 (if you are ever > > intending on doing that) so you don't remove the mergeinfo in stable/8 by > > accident. > > > > > Right. This work will be making its way into the tree via patches to and > MFCs from HEAD rather than direct merges from my project branches, so I > don't anticipate any scary problems. I will be super vigilant though. Ok. To be honest that is how I use feature branches in svn myself due to the "--reintegrate only works once" brain damage. -- John Baldwin