2023-05-18 11:53 AEST by Arthur Barrett - if merge is prevented by ACL, default error message has wrong branch



eg: when merging from HEAD to P_STG the error is:



Merging  in C:\cvs_work_folder_02\COMMONTHIS



In C:\cvs_work_folder_02\COMMONTHIS (P_STG): "C:\Program Files (x86)\CVS Suite\CVSNT\cvs.exe" -q 
update -B 123456 -e -j HEAD -d .

CVSROOT=:pserver:pappalab@10.1.9.1:/myrepo



cvs server: User 'thisusera' cannot merge branch HEAD with branch HEAD

 



The 'first' HEAD in this message is incorrect.



update_dirent_proc() in update.cpp may not be calling ParseTag() to populate tag2send to the correct value.