Boost logo

Boost :

Subject: Re: [boost] [Iterator] Fixing the default reference type of transform_iterator (#5127)
From: Jeffrey Lee Hellrung, Jr. (jeffrey.hellrung_at_[hidden])
Date: 2012-04-22 01:54:19


On Sat, Apr 21, 2012 at 10:41 PM, Michel Morin <mimomorin_at_[hidden]> wrote:

> Jeffrey Lee Hellrung, Jr. wrote:
> > I applied your patch and committed (rev 78121).
> > If I screwed something up in the process of
> > committing, apologies and someone please let me know!
>
> Thanks for committing, Jeff!
>
>
> > A somewhat related but more general question: What is the procedure to
> get
> > changes from trunk into release? I understand we wait a couple days for
> the
> > tests to cycle, ensure there aren't any regressions, then merge to
> > release...and this last merging step in SVN I'm not familiar with. I
> > certainly don't want to mess anything up.
>
> Sorry, I don't have any knowledge about merging :/
>
> Boost wiki has some information on merging:
>
> https://svn.boost.org/trac/boost/wiki/ImprovingPractices#Mergingchangesfromdevelopmenttrunktoreleasebranch
> but it only says about TortoiseSVN.
>

That might be good enough, as I am currently using TortoiseSVN.

Can some Boost developers provide the information on
> * how to merge into the release branch via svn
> * what should we care about when merging
> ?
>

If anyone can just quickly confirm that the wiki is up-to-date and complete
regarding merging (maybe at least as far as TortoiseSVN is concerned), that
would help, too.

- Jeff


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk