From owner-svn-src-all@FreeBSD.ORG Sat Jun 21 01:21:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADB94B2E; Sat, 21 Jun 2014 01:21:36 +0000 (UTC) Received: from shxd.cx (unknown [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96B222EF3; Sat, 21 Jun 2014 01:21:36 +0000 (UTC) Received: from [50.204.88.51] (port=26875 helo=THEMADHATTER) by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1Wy5Qy-0009S9-L8; Fri, 20 Jun 2014 13:29:16 -0700 From: To: "'Glen Barber'" , "'Devin Teske'" References: <201406201807.s5KI755X045471@svn.freebsd.org> <20140621003400.GJ1218@hub.FreeBSD.org> In-Reply-To: <20140621003400.GJ1218@hub.FreeBSD.org> Subject: RE: svn commit: r267684 - in stable/9: . usr.sbin Date: Fri, 20 Jun 2014 18:21:32 -0700 Message-ID: <01b801cf8cef$2332d500$69987f00$@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQErAWbqM8rUJx5hZJygkY9nwuIKKwJGzp4anLGjFtA= Content-Language: en-us Sender: devin@shxd.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 01:21:36 -0000 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