Re: [Boost-build] RC_1_34_0 to trunk reconciliation

From: Roland Schwarz (roland.schwarz_at_[hidden])
Date: 2007-08-18 11:08:07

Rene Rivera wrote:
> I object... I don't want to loose the trunk changes ;-)

This is why I made a three way compare. Not to loose the changes from trunk.

If you look closely to the proposed files you can see that most of them 
differ only in small items (which I tried to track down).

python.jam and gcc.jam differ in more changes.

About Python.jam there is a statement from David to use the one from 
RC_1_34_0 since he knows the one in trunk hasn't been maintained.

Left gcc.jam and os.jam.

Every other files that differ between RC and trunk are taken from trunk.
So nothing is lost.

What I was suggesting: Just those 6 files likely need consideration.

Roland aka speedsnail