Re: [boost] [1.40.0] Unmerged changes delaying beta 1

Subject: Re: [boost] [1.40.0] Unmerged changes delaying beta 1
From: Vladimir Prus (vladimir_at_[hidden])
Date: 2009-08-10 10:43:37

Beman Dawes wrote:

> There seem to be a large number of changes to trunk that have not been
> merged into branches/release. Perhaps a lot of merges were forgotten
> after the bug fixing sprint. All of the libraries listed below are
> suspect, although some may just be holding changes until after the
> release.
> 
> "svn diff" can be used to see exactly what changes have not been
> merged. Here is a simple Windows batch file that eases typing; perhaps
> someone could post a Unix equivalent.

> program_options

I believe the script is confused here. There are no actual code changes,
just mergeinfo changes -- which are expected and will always be there. 
See below for svn diff output.

- Volodya

ghost_at_wind:~/Work/Boost/boost-svn$ svn diff ^/branches/release/boost/program_options
^/trunk/boost/program_options

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /trunk/boost/boost/program_options:r22824-38326
   Reverse-merged /devel/boost/program_options:r38327-38328
   Reverse-merged /trunk/boost/program_options:r38329-55194,55224

ghost_at_wind:~/Work/Boost/boost-svn$ svn diff ^/branches/release/libs/program_options
^/trunk/libs/program_options

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /trunk/boost/libs/program_options:r22824-38326
   Reverse-merged /devel/libs/program_options:r38327-38328
   Reverse-merged /trunk/libs/program_options:r38329-55193,55224