Date: Tue, 13 Oct 2009 17:32:06 -0400 From: John Baldwin <jhb@freebsd.org> To: Lawrence Stewart <lstewart@freebsd.org> 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... Message-ID: <200910131732.07310.jhb@freebsd.org> In-Reply-To: <4AD4F095.1060306@freebsd.org> References: <200910132021.n9DKLHkj015399@svn.freebsd.org> <200910131706.36935.jhb@freebsd.org> <4AD4F095.1060306@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910131732.07310.jhb>