2011-05-12 02:10 AEST by Arthur Barrett - During cvs update -j (join merge) customer gets this error on C: drive but not on network drive (H:):

cvs server: Updating ADF/IRX/ADF/Model/src/acca/oracle/adf/irx/model/businessobjects
cvs server: conflict:
ADF/IRX/ADF/Model/src/acca/oracle/adf/irx/model/businessobjects/PepPeaFkAssoc.xml is modified 
but no longer in the repository
C
ADF/IRX/ADF/Model/src/acca/oracle/adf/irx/model/businessobjects/PepPeaFkAssoc.xml
A
ADF/IRX/ADF/Model/src/acca/oracle/adf/irx/model/businessobjects/XxPendingCbeSittingsEO.xml
RCS file:
/cvs/IRX/ADF/Model/src/acca/oracle/adf/irx/model/businessobjects/XxPendingCbeSittingsEO.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into
XxPendingCbeSittingsEO.xml cvs [update aborted]: cannot open CVS/Base/XxPendingCbeSittingsEO.xml 
for writing: No such file or directory


in baserev_update() in update.cpp when there is no basefilegz we should try and be more 
comprehensive in trying to write the 'Base' File.

Things we could do:
* before call RCS_checkout - test if file already exists, and delete it/move it away
  - if file exists and cannot be moved/renamed could give a better error, eg:
      the file 'filename' owned by 'owner' with permissions 'perms' cannot be deleted or moved
      please ask the owner of the file to move/delete it
* if RCS_checkout fails due to local errors (eg: write error/open error) give it a new (random) filename
* use the various move/delete methods that the server does for the repository on windows, eg:
   - memory mapped
   - win32 system calls
   - shell functions


The recommended workaround is to:
* reboot PC, and retry.  If error still occurs then:
* try checking out to new directory on same drive, eg: c:\temp.  If error still occurs then:
* try checking out to different drive (eg: network H: drive).  If error still occurs then:
* try upgrading/downgrading anti-virus software