From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 10 00:40:44 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76FB81065672 for ; Sat, 10 Jan 2009 00:40:44 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id DB4C68FC13 for ; Sat, 10 Jan 2009 00:40:43 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 5027 invoked by uid 399); 10 Jan 2009 00:14:02 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 10 Jan 2009 00:14:02 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4967E849.8070100@FreeBSD.org> Date: Fri, 09 Jan 2009 16:14:01 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090102) MIME-Version: 1.0 To: Alexander Motin References: <200901092210.n09MA7Xb070527@svn.freebsd.org> <4967DE41.20109@FreeBSD.org> In-Reply-To: <4967DE41.20109@FreeBSD.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Robert Watson Subject: Re: svn commit: r186982 - stable/7/usr.sbin/powerd X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2009 00:40:44 -0000 Alexander Motin wrote: > Robert Watson wrote: >> >> On Fri, 9 Jan 2009, Alexander Motin wrote: >> >>> Modified: >>> stable/7/usr.sbin/powerd/powerd.8 >>> stable/7/usr.sbin/powerd/powerd.c >> >> I notice that you didn't use svn merge for this MFC, so there's no >> tracking of what revs were merged. Was it just everything to date? > > I just copied files completely, so everything is merged now. > > AFAIK it was decided that merge info is not mandatory before 9.x > branching. I'm just not very good with this merge stuff yet. For something like this it's quite simple, just do the merge in usr.sbin/powerd. Let's say you want to merge all the changes starting with r185050: Set REPO to something useful like svn+ssh://svn.freebsd.org/base/ svn merge -r 185050:186476 $REPO/head/usr.sbin/powerd . If you want to cherry-pick individual changes, use for example '-c 185050' instead of the -r option above. And the good news is that it's not too late to record your merge info. Figure out the range of changes that you have incorporated into the latest update, and use -r and the --record only option to merge. hth, Doug -- This .signature sanitized for your protection