From owner-svn-src-stable@FreeBSD.ORG Mon Jan 12 17:25:11 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A622106571C; Mon, 12 Jan 2009 17:25:11 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 31C268FC14; Mon, 12 Jan 2009 17:25:10 +0000 (UTC) (envelope-from des@des.no) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 66C1D6D43F; Mon, 12 Jan 2009 17:09:50 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 48EC9844EF; Mon, 12 Jan 2009 18:09:50 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Doug Barton References: <200901092210.n09MA7Xb070527@svn.freebsd.org> <4967DE41.20109@FreeBSD.org> <4967E849.8070100@FreeBSD.org> Date: Mon, 12 Jan 2009 18:09:50 +0100 In-Reply-To: <4967E849.8070100@FreeBSD.org> (Doug Barton's message of "Fri, 09 Jan 2009 16:14:01 -0800") Message-ID: <86k5905u3l.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, Alexander Motin , src-committers@freebsd.org, Robert Watson , svn-src-all@freebsd.org Subject: Re: svn commit: r186982 - stable/7/usr.sbin/powerd X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 17:25:17 -0000 Doug Barton writes: > 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 . This merges everything from *185051* to 186476. Think about it in terms of diff: 'svn diff -r185050:186476' clearly means "compare the tree as it was after r185050 was committed with the tree as it was after r186476 was committed" If you want to merge the change that was committed in r185050, you need to start at r185049. If there aren't many revisions to merge, you can also merge them individually with -cN, which is a shortcut for -r(N-1):N. Perhaps I should document this better on the wiki - my examples all merge individual revisions, not ranges. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no