Perforce Jam 2.4 integration

From: David Abrahams (david.abrahams_at_[hidden])
Date: 2002-02-13 10:14:33

As I understand it, the tedious job of getting our source up-to-date with
Perforce is currently our main bottleneck.

Rene, if this continues to be a struggle for you, please assign me a
fraction of the files to work on. Between emacs'
merge-directory-revisions-with-ancestor and my whitespace-insensitive diff3
executable, I think I can make this relatively painless. Also I can give you
some superior auto-merged file results which would give you a head-start.

I am beginning to think that we ought to convert spaces back into tabs for
this source, since otherwise we will always have trouble keeping in synch
with Perforce.

As a matter-of-fact, that might be the easiest way to make the merge
less-painful. It would be fairly easy to go through our sources and convert
the spaces back into tabs. Should we do this now, after the merge, or not at
all?

-Dave

*---------------------------------------------------*
David Abrahams
C++ Booster (http://www.boost.org)
Pythonista (http://www.python.org)
resume: http://users.rcn.com/abrahams/resume.html
email: david.abrahams_at_[hidden]
*---------------------------------------------------*