Having some kind of user-selected diff/merge hook built into CVS would go
a long way to solving this problem, though. It's been discussed before.
--- Forwarded mail from [EMAIL PROTECTED]
[ On Wednesday, August 30, 2000 at 11:58:09 (-0400), Gary Smith wrote: ]
> Subject: Is this possible?
>
> Has anyone heard, seen or wanted the following feature. Also, is this
> available in cvs, wincvs or any other version control system?
>
> I need the ability to choose which changes I have made in a file to
> checkin. The default in most systems is to merge all the changes with
> those on the server. I would like to interactive say YES to the first
> change NO to the second, YES to the third change etc..
>
> Have I over looked something?
SCCS has this ability by default (though I don't think it yet works 100%
correctly in GNU CSSC). This would imply that BitKeeper will have
similar functionaly underneath, though I'm not sure at the moment
whether or not they offer it directly to the user.
In some respects any two-phase transaction based version control system
could be said to have such ability, anc I would count Aegis as one that
could probably do what you want it to do.
--- End of forwarded message from [EMAIL PROTECTED]