[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: cvswrappers - any better suggestions ?

From: Paul Sander
Subject: RE: cvswrappers - any better suggestions ?
Date: Mon, 2 Apr 2001 16:52:27 -0700

--- Forwarded mail from address@hidden

>> Inserting a registrar into CVS to allow shops and users to specify the
>> particular tool required to perform a merge is not a fundamental change to
>> the CVS design, but it is a small generalization.

>Yes, but one that would require a rather drastic revision to the
>repository format.

>>  And it's one that will
>> greatly benefit the CVS community in general.

>I'm not so sure.  If it were so it would have been done long ago and
>offered back to the community.  As it is we don't even have a sample
>implementation to show to the community and to prove that such a forward
>change in the repository format would succeed.

co -p <common-ancestor-revision> file > .file.base
co -p <other-contributor> file > .file.contrib
my-merge-tool --base .file.base --contributor .file.contrib file

This algorithm can be easily implemented with CVS (in fact, I believe it
already is).  And it does not require any change to the repository format,
other than providing a means to specify what my-merge-tool really is.

--- End of forwarded message from address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]