[cvsnt] Conflict text customisation

[James Wilkinson]

Hi all,

While working on huge and complex software project, one of my developers found that the product build was broken. Unfortunately, the error from the build did not give many clues as to the nature of the problem. The problem turned out to be a CVS merge conflict (quite rightly) but the standard conflict text of:


   <<<< File.ext 1.4

      Your changes

   =====

      Other persons changes

   >>>>


caused strange build errors.


Obviously the developer should have spotted the "C for Conflict" in the output log of WinCVS, but when updating a lot of files, it's easy to miss one.


This problem could be helped immeasurable by a facility to spit out custom text around the CVS conflict section, for example:

  #error CVS Conflict


Is it possible to configure/modify CVSNT to do this?

...or is does anyone know how to make WinCVS give an "in your face" warning message when there were conflicts from an update?

Regards,
James

James Wilkinson
Senior Developer
Kudos Digital Group