Boost logo

Boost :

From: John Maddock (John_Maddock_at_[hidden])
Date: 2000-08-03 06:32:55

Mark, Jens, Beman,

The files boost/boost/integer.hpp and boost/boost/functional.hpp in the cvs
repository appear to have been modified by me - in fact if you check the
diffs you should find no change (actually integer.hpp appears to have
acquired an extra blank line at the end, and functional.hpp has had the
$log entry auto-updated by cvs). My apologies about this these shouldn't
have been changed - and just when I thought I understood cvs!

For future reference the "unexpected" update occured as a result of a
branch merge of the updated type-traits code with the main "trunk". The
files integer.hpp and functional.hpp both were flagged as changed - and
functional.hpp had conflicts arising from the use of $log$. Thinking that
I would play safe, I deleted those files from the working copy and replaced
them with the backup copies cvs had helpfully provided - but in doing so I
altered their time stamps - and hence they got committed along with my
intended changes. What I should have done was just delete them - that way
the commit would have ignored them, and my next update would have restored
the originals from the repository.

Sorry guys!

- John.

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