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

Subject: Re: [boost] [svn] merge to release HOWTO?
From: Steven Watanabe (watanabesj_at_[hidden])
Date: 2009-12-13 18:11:22

AMDG

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?

What you're doing is fine.  The property changes should all be 
svn:mergeinfo.
The changes all over the place are just a result of the way 
svn:mergeinfo works.

In Christ,
Steven Watanabe