[boost] ATTN: Beman: Merge permission sought

Subject: [boost] ATTN: Beman: Merge permission sought
From: Eric Niebler (eric_at_[hidden])
Date: 2008-10-13 12:15:52

Nicola Musatti wrote:
> Hallo,
> I would like to merge the following changes from trunk to the release 
> branch:
> 
> http://svn.boost.org/trac/boost/attachment/ticket/2341/call_traits.patch

Looks fine. Go ahead.

> 
> http://svn.boost.org/trac/boost/attachment/ticket/2342/sp_convertible.patch

Looks fine. Go ahead.

> http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patch 
> 

Beman should check the non-trivial change to convenience.hpp.

> 
> http://svn.boost.org/trac/boost/attachment/ticket/2344/boost_iterator.patch
> 

Looks fine. Go ahead.

> They all relate to supporting the latest CodeGear (ex Borland) compiler 
> and all went through at least one successful test cycle on trunk. May I 
> go ahead?
> 
> Is the merge procedure outlined here: 
> http://svn.boost.org/trac/boost/wiki/ImprovingPractices#Mergingchangesfromdevelopmenttrunktoreleasebranch 
> 
> still considered the correct one?

Looks like only merge procedures for TortoiseSVN are documented. I 
thought the preferred method was to use svnmerge.py for its merge 
tracking feature. Sadly, it seems that there is no agreed merge 
procedure. :-(

-- 
Eric Niebler
BoostPro Computing
http://www.boostpro.com