From owner-svn-src-all@FreeBSD.ORG  Fri Jan  9 23:31:11 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 729281065670;
	Fri,  9 Jan 2009 23:31:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from cmail.optima.ua (cmail.optima.ua [195.248.191.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 106528FC1A;
	Fri,  9 Jan 2009 23:31:09 +0000 (UTC) (envelope-from mav@FreeBSD.org)
X-Spam-Flag: SKIP
X-Spam-Yversion: Spamooborona-2.1.0
Received: from [212.86.226.226] (account mav@alkar.net HELO
	mavbook.mavhome.dp.ua)
	by cmail.optima.ua (CommuniGate Pro SMTP 5.2.9)
	with ESMTPSA id 231279149; Sat, 10 Jan 2009 01:31:09 +0200
Message-ID: <4967DE41.20109@FreeBSD.org>
Date: Sat, 10 Jan 2009 01:31:13 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Thunderbird 2.0.0.17 (X11/20081029)
MIME-Version: 1.0
To: Robert Watson <rwatson@FreeBSD.org>
References: <200901092210.n09MA7Xb070527@svn.freebsd.org>
	<alpine.BSF.2.00.0901092313130.16794@fledge.watson.org>
In-Reply-To: <alpine.BSF.2.00.0901092313130.16794@fledge.watson.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org
Subject: Re: svn commit: r186982 - stable/7/usr.sbin/powerd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2009 23:31:33 -0000

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.

-- 
Alexander Motin