Re: [jamboost] Perforce Jam 2.4 integration

From: Rene Rivera (grafik666_at_[hidden])
Date: 2002-02-13 10:52:53

On 2002-02-13 at 10:14 AM, david.abrahams_at_[hidden] (David Abrahams) wrote:

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

Agreed.

>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'd love to have any auto-merge files :-) As it's been painfull to try
simulating a 3-way diff with 2 separate diffs :-(

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

I'll confess, I like tabs :-}

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

How about this... Dave, do a quick translation to tabs, put this on a branch
(Perforce_2_4_Merge?), possibly do a quick emacs merge and put that in the
branch (I wish I knew how to use emacs more proficiently). I can then compare
that to the changes I've made, not many :-(

I have time to work on this tonight, and with a better diff history I can get
a fair amount of it done tonight and committed. After that we can divide the
files up.

Getting most of this done before the weekend is better for me, as I'll be on
vacation next week (headed for the warmth of Costa Rica :-] ).

-- grafik - Don't Assume Anything
-- rrivera_at_[hidden] - grafik_at_[hidden]
-- 102708583_at_icq - Grafik666_at_AIM - Grafik_at_[hidden]