Date: Fri, 09 Jan 2009 16:14:01 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Alexander Motin <mav@FreeBSD.org> Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Robert Watson <rwatson@FreeBSD.org> Subject: Re: svn commit: r186982 - stable/7/usr.sbin/powerd Message-ID: <4967E849.8070100@FreeBSD.org> In-Reply-To: <4967DE41.20109@FreeBSD.org> References: <200901092210.n09MA7Xb070527@svn.freebsd.org> <alpine.BSF.2.00.0901092313130.16794@fledge.watson.org> <4967DE41.20109@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4967E849.8070100>