svn commit: r186982 - stable/7/usr.sbin/powerd
des at des.no
Mon Jan 12 09:25:17 PST 2009
Doug Barton <dougb at 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.
Dag-Erling Smørgrav - des at des.no
More information about the svn-src-stable-7