It would not be necessary for the merge tool itself to muck around with
CVS metadata.  Just have CVS do that and invoke an external tool to perform
the actual work of the merge.

--- Forwarded mail from [EMAIL PROTECTED]

[EMAIL PROTECTED] on 2001.04.11 21:31:01
>On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
>> - Invoke a type-specific merge tool, ideally one of the user's choice.
>
>Actually, simply "an external tool.  Period" would be sufficient.  Then
>said external tool can have whatever intelligence it wants to determine
>filetype and such.  No need to push that into CVS.

I disagree.  Merging (and diffing) is part of what CVS does.  I see no reason
not to be able to specify what merge/diff algorithm is used by CVS.  Such a
design would implement the Template Design Pattern.

If a wrapper tool were used, it would necessarily have to munge around the
CVS/Entries file which is supposed to be internal to CVS (eg its implementation
could change or it could disappear altogether in the future).

--- End of forwarded message from [EMAIL PROTECTED]


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to