[tex-k] Merging sources is hard

sebastian.rahtz@computing-services.oxford.ac.uk sebastian.rahtz@computing-services.oxford.ac.uk
Sat, 10 Nov 2001 16:55:40 +0000

Olaf Weber writes:
 > FYI, the source.develpment perforce source tree contains a merge of
 > web2c 7.3.4 and omega 1.23.  However, the Omega people made many
 > changes to the web2c stuff to get things to compile with a C++
 > compiler, and it seems that the merge of these has resulted in many
 > 7.3.4-specific bits being lost.  I'm working on a "correct" merge, and
 > will make these sources available as soon as I can.

right. what you see in source.development is my unfinished merge. I
had been meaning to tell you that.... if you can clean up the
resulting mess, it will be great!

I know that today we are in a mess, but I think a little more work
should see web2c 7.3.4, TeXLive, teTeX, and the Omega source tree all
is an identical state. This will be REALLY GOOD!!!