Boost logo

Boost :

From: Hartmut Kaiser (hartmut.kaiser_at_[hidden])
Date: 2007-11-01 14:07:17

> Below is the list of files needing changes merged from 1.34.1
> that Dave Abrahams generated, sorted by developer.
> Each developer in this list needs to see if changes need to
> be merged from 1.34.1. It would be helpful to respond to this
> message indicating "done" when you've completed this task so
> I can monitor progress.
> As an example, consider libs/filesystem/src/operations.cpp:
> To merge via the command line, cd to the working copy of the
> trunk, boost-trunk/libs/filesystem/src directory, and enter
> (all on one line):
> svn merge -r37476:HEAD
> operations.cpp
> For TortoiseSVN, right click
> boost-trunk/libs/filesystem/src/operations.cpp, click
> "TortoiseSVN", click "Merge", and fill out the dialog. See
> the attached .jpg for a screen shot of the filled out merge dialog.
> In the case of operations.cpp, a diff showed that someone had
> made a fix for a specific compiler and not merged the fix
> back to trunk. So I went ahead with the merge and committed
> the resulting file. If the change had not been desired, I
> would simply have not done the merge, or reverted if I'd been
> using the command line and had already merged.
> --Beman
> -----------------------------------------------------------------

> C hkaiser index.htm

No need to merge this, I assume.

Regards Hartmut

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