Date: Fri, 20 Jun 2014 18:21:32 -0700 From: <dteske@FreeBSD.org> To: "'Glen Barber'" <gjb@FreeBSD.org>, "'Devin Teske'" <dteske@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: RE: svn commit: r267684 - in stable/9: . usr.sbin Message-ID: <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> In-Reply-To: <20140621003400.GJ1218@hub.FreeBSD.org> References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Because we've been told to only ever merge things to the
root of a stable branch.
I made the mistake of doing the merge in the usr.sbin/bsdconfig
sub-directory (because I had not made a commit in a while).
This commit was just to add the missing mergeinfo to the TLDs.
In other words,...
I had earlier today done:
cd stable/9/usr.sbin/bsdconfig
svn mergeinfo --show-revs=eligible ^/head/usr.sbin/bsdconfig | dview -
svn merge -cr... ^/head/usr.sbin/bsdconfig
# repeat the above 2 steps until I've merged all the things for pkgng
integration
cd ../../../../head/usr.sbin/bsdconfig
svn up
cd ../../../
diff -rpuNI\$FreeBSD head/usr.sbin/bsdconfig stable/9/usr.sbin/bsdconfig
# Fix a few things that got regressed due to the fact that some of the
patches
# I merged were out of sync (because the pkgng patches were passed-over
# in the first round of MFC's leading up to release cycle)
cd stable/9/usr.sbin/bsdconfig
svn diff -x -p | dview -
# Confirm each/every hunk as being proper and correct
cd ../../../../
diff -rpuNI\$FreeBSD {head,stable/9}/usr.sbin/bsdconfig | dview -
# Make sure we're converging branches satisfactorily
cd stable/9/usr.sbin/bsdconfig
svn diff -x -p | dview -
# Last and final check (in my triple-check procedure)
svn ci
And where that went wrong was, that I should have been in stable/9
when I was doing "svn merge -cr...".
So all this commit is doing is getting the mergeinfo recorded to stable/9
and stable/9/usr.sbin
--
Devin
> -----Original Message-----
> From: Glen Barber [mailto:gjb@FreeBSD.org]
> Sent: Friday, June 20, 2014 5:34 PM
> To: Devin Teske
> Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src-
> stable@freebsd.org; svn-src-stable-9@freebsd.org
> Subject: Re: svn commit: r267684 - in stable/9: . usr.sbin
>
> On Fri, Jun 20, 2014 at 06:07:05PM +0000, Devin Teske wrote:
> > Author: dteske
> > Date: Fri Jun 20 18:07:04 2014
> > New Revision: 267684
> > URL: http://svnweb.freebsd.org/changeset/base/267684
> >
> > Log:
> > Add missing mergeinfo for 267683.
> >
> > Modified:
> > Directory Properties:
> > stable/9/ (props changed)
> > stable/9/usr.sbin/ (props changed)
>
> This looks wrong. Why is there mergeinfo to the root of the branch?
>
> Glen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?01b801cf8cef$2332d500$69987f00$>