Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jan 2010 19:22:33 +0000 (GMT)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        Doug Barton <dougb@FreeBSD.org>
Cc:        svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org
Subject:   Re: svn commit: r202464 - stable/8/etc/rc.d
Message-ID:  <alpine.BSF.2.00.1001221918500.92817@ury.york.ac.uk>
In-Reply-To: <4B59E591.2010808@FreeBSD.org>
References:  <201001171110.o0HBAPmc002877@svn.freebsd.org> <4B59E591.2010808@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 22 Jan 2010, Doug Barton wrote:

> On 1/17/2010 3:10 AM, Gavin Atkinson wrote:
> > Author: gavin
> > Date: Sun Jan 17 11:10:24 2010
> > New Revision: 202464
> > URL: http://svn.freebsd.org/changeset/base/202464
> > 
> > Log:
> >   Merge r201440, r201445 from head:
> 
> FYI, all merges to things under etc/ should happen in etc/, not in
> directories below it. Mergeinfo for this commit (and the one in
> stable/7) needs to be pulled up.

OK, I'll see what I can do, although I may not get a chance until Sunday.  
Should this be documented on 
http://wiki.freebsd.org/SubversionPrimer/Merging?

Thanks,

Gavin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1001221918500.92817>