Boost logo

Boost :

Subject: [boost] [svn] merge to release HOWTO?
From: Eric Niebler (eric_at_[hidden])
Date: 2009-12-13 17:01:55

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 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:

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?

Eric Niebler
BoostPro Computing

Boost list run by bdawes at, gregod at, cpdaniel at, john at