+1 to history (though it sounded as if you might be integrating the VCS with cvs, so maybe this is already on the way). JBuilder's little history and diff browser is quite nice (though not as nice as webcvs :)
but please don't handles merge conflicts the way JBuilder does it. None of the developers at my orgranization like the way JBuilder wraps the conflicts in comments, making the code compilable. We feel that the code should not compile until the conflicts are resolved. It might be nice for the code parser and structure window to understand and highlight the conflict blocks (though this is not really important to me).
> -----Original Message-----
> From: Florin Manolache [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 21, 2002 8:46 AM
> To: [EMAIL PROTECTED]
> Subject: [Eap-list] CVS features
>
>
> Hi,
>
> It would be nice to have the following features for CVS:
>
> 1. conflict detection and management (like in JBuilder for example)
> 2. CVS history for files (like the 'vcs history')
>
>
> Florin
>
>
>
> _______________________________________________
> Eap-list mailing list
> [EMAIL PROTECTED]
> http://www.intellij.com/mailman/listinfo/eap-list
>
The information contained in this e-mail including any attachments may constitute Corvis Corporation Proprietary Information that is subject to Non-Disclosure Agreement and cannot be disclosed to any other party without the express consent of Corvis Corporation.
If you are neither the intended recipient of this e-mail nor responsible for delivering this e-mail to the intended recipient, note that any dissemination, distribution, copying, or retention of this e-mail is prohibited.
If you believe you have received this e-mail in error, we request that you notify the sender by return e-mail and then delete this e-mail and any return e-mail immediately.
