Re: [boost] [svn] merge to release HOWTO?

Subject: Re: [boost] [svn] merge to release HOWTO?
From: egoots (egoots_at_[hidden])
Date: 2009-12-13 19:13:24

On 12/13/2009 2:01 PM, Eric Niebler wrote:
> I clearly am doing something wrong when it comes to merging changes from
> trunk to release. I feel that as one of the release managers, this is
> something I should know. :-P Long ago, the agreed procedure was to use
> svnmerge.py to merge individual revisions (or revision ranges) from
> trunk to release, running it from the root of the release branch. I have
> been faithfully doing it this way. But look at the result of my most
> recent merge:
>
> https://svn.boost.org/trac/boost/changeset/58336
>
> The revisions I merged had only changes to proto and xpressive, but what
> actually got merged includes property changes to files and directories
> all over the map. What's going on? Am I not doing it the right way?

While I can't answer the boost respository specific aspects of your 
questions, the following article might be helpful as background info:

http://www.open.collab.net/community/subversion/articles/merge-info.html