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 http://svn.boost.org/trac/boost/attachment/ticket/2342/sp_convertible.patch http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patc... http://svn.boost.org/trac/boost/attachment/ticket/2344/boost_iterator.patch 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#Mergingchangesfromde... still considered the correct one? Cheers, Nicola -- Nicola.Musatti <at> gmail <dot> com Home: http://nicola.musatti.googlepages.com/home Blog: http://wthwdik.wordpress.com/
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.patc...
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#Mergingchangesfromde...
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
Eric Niebler wrote:
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.
Done.
http://svn.boost.org/trac/boost/attachment/ticket/2342/sp_convertible.patch
Looks fine. Go ahead.
Done.
http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patc...
Beman should check the non-trivial change to convenience.hpp.
Waiting.
http://svn.boost.org/trac/boost/attachment/ticket/2344/boost_iterator.patch
Looks fine. Go ahead.
Done. Thanks! Cheers, Nicola -- Nicola.Musatti <at> gmail <dot> com Home: http://nicola.musatti.googlepages.com/home Blog: http://wthwdik.wordpress.com/
On Mon, Oct 13, 2008 at 3:29 PM, Nicola Musatti <Nicola.Musatti@gmail.com>wrote:
http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patc...
Beman should check the non-trivial change to convenience.hpp.
Waiting.
Looks OK. Go ahead. --Beman
Beman Dawes wrote:
On Mon, Oct 13, 2008 at 3:29 PM, Nicola Musatti <Nicola.Musatti@gmail.com>wrote:
http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patc...
Beman should check the non-trivial change to convenience.hpp.
Waiting.
Looks OK. Go ahead.
It looks like you already did it with your last merge. Thanks! Cheers, Nicola -- Nicola.Musatti <at> gmail <dot> com Home: http://nicola.musatti.googlepages.com/home Blog: http://wthwdik.wordpress.com/
On Mon, Oct 13, 2008 at 3:53 PM, Nicola Musatti <Nicola.Musatti@gmail.com>wrote:
Beman Dawes wrote:
On Mon, Oct 13, 2008 at 3:29 PM, Nicola Musatti <Nicola.Musatti@gmail.com
wrote:
http://svn.boost.org/trac/boost/attachment/ticket/2352/boost_filesystem.patc...
Beman should check the non-trivial change to convenience.hpp.
Waiting.
Looks OK. Go ahead.
It looks like you already did it with your last merge. Thanks!
Ah! Yes, that's what happened. My regression tests that were passing are all still passing, plus most of the tests are now passing for Godegear. Thanks for working on this! --Beman
participants (3)
-
Beman Dawes -
Eric Niebler -
Nicola Musatti