2011-05-19 05:24 AEST by Arthur Barrett - ACL wrong msg "cannot merge branch HEAD with branch HEAD"

cvs up -j HEAD -B 12345
cvsnt server: Updating .
cvsnt server: User 'ipassing' cannot merge branch HEAD with branch HEAD

cvs rlsacl EM

Directory: EM
Owner: cvsadmin

user=cvs_dev,branch=HEAD
        read
        write
        create

cvs status CLESWEB.USER_ADDRESS_VW.FEW
===================================================================
File: CLESWEB.USER_ADDRESS_VW.FEW       Status: Up-to-date

   Working revision:    1.2
   Repository revision: 1.2     /estee/EM/CLESWEB/views/CLESWEB.USER_ADDRESS_VW.
FEW,v
   Expansion option:    kvx
   Commit Identifier:   7d874dc1c937066d
   Sticky Tag:          P_DEV (branch: 1.2.4)
   Sticky Date:         (none)
   Sticky Options:      kvx
   Merge From:          (none)

2011-05-19 05:26 AEST by Arthur Barrett - ACL working OK, if I create the right ACL it does allow me, just wrong default 
message.

C:\junk\P_DEV\CLESWEB\views>cvs rlsacl EM
Directory: EM
Owner: cvsadmin

user=cvs_dev,branch=HEAD
        read
        write
        create

user=cvs_promote,branch=P_DEV,merge=HEAD
        read
        write
        create


C:\junk\P_DEV\CLESWEB\views>cvs up -j HEAD -B 12345
cvsnt server: Updating .
RCS file: /estee/EM/CLESWEB/views/CLESWEB.USER_ADDRESS_VW.FEW,v
retrieving revision 1.3
retrieving revision 1.4
Merging differences between 1.3 and 1.4 into CLESWEB.USER_ADDRESS_VW.FEW