[26] in Coldmud discussion meeting

root meeting help first first in chain previous in chain previous next last

looking into the future

daemon@ATHENA.MIT.EDU (Tue Nov 16 12:42:42 1993 )

Date: Tue, 16 Nov 93 08:59:06 PST
From: bsw!tungsten.seattle.geoworks.com!weber@uunet.UU.NET (Eric Weber)
To: Lynx <BRANDON@cc.usu.edu>
Cc: coldstuff@MIT.EDU
In-Reply-To: <01H5CZYA48L4ANHKWW@cc.usu.edu>

If you have the old core around, it seems much more reliable to have
the merge script look at all three files (old core, new core, active
db).  If a method or parameter has changed only in either the new core
or the active db but not both, no problem. If it has changed in both,
mark it for manual fixup.  This way there is no need to mark what has
changed, the script can determine that for itself.

We do something similar here at work to merge multiple programmers'
changes to code files.

-- Eric