Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Jan 2009 18:09:50 +0100
From:      =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To:        Doug Barton <dougb@FreeBSD.org>
Cc:        svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, Alexander Motin <mav@FreeBSD.org>, src-committers@freebsd.org, Robert Watson <rwatson@FreeBSD.org>, svn-src-all@freebsd.org
Subject:   Re: svn commit: r186982 - stable/7/usr.sbin/powerd
Message-ID:  <86k5905u3l.fsf@ds4.des.no>
In-Reply-To: <4967E849.8070100@FreeBSD.org> (Doug Barton's message of "Fri, 09 Jan 2009 16:14:01 -0800")
References:  <200901092210.n09MA7Xb070527@svn.freebsd.org> <alpine.BSF.2.00.0901092313130.16794@fledge.watson.org> <4967DE41.20109@FreeBSD.org> <4967E849.8070100@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Doug Barton <dougb@FreeBSD.org> 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k5905u3l.fsf>