Subject: Re: [boost] [release] scope_exit, local_function, utility/identity_type, and functional/overloaded_function
From: Eric Niebler (eric_at_[hidden])
Date: 2012-05-01 02:21:06
On 4/30/2012 10:28 PM, Jeffrey Lee Hellrung, Jr. wrote:
> On Mon, Apr 30, 2012 at 10:19 PM, Eric Niebler <eric_at_[hidden]> wrote:
>> Merging from the root is Boost's recommended practice, and is not
>> painful at all if you're using a recent version of svn. Prefer to do it
>> that way.
>> You can merge many changesets to release at once using:
>> svn merge -c 1111 -c 2222 -c 3333 ^/trunk
>> where 1111, 2222, etc are the numbers of the changesets. (I didn't know
>> about the ^/trunk syntax until just now, and I've never used it, but I
>> will now. Thanks, Daniel.)
> Hmmm..what you're saying *looks* to be in conflict with  (which,
> incidently, I just modified as the TortoiseSVN instructions were outdated).
> Can you (or Daniel, or anyone) clarify/comment?
> - Jeff
Hrm. Either best practice has changed while I was sleeping (possible),
or else whoever wrote this didn't know about Boost's merge policy. The
proscription against merging individual files and subdirectories comes
from long ago ... possibly a time when svn merge tracking was very
rudimentary. It's possible that it doesn't make a difference now. Does
-- Eric Niebler BoostPro Computing http://www.boostpro.com
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk