CVS 1.11.17 merging problem

[mohamad . ridha]

Hi all,


I am trying to do the CVS upgrade from ver 1.11.1p1 to 1.11.17, and
before I do that I need to perform consistency check of behaviors
between the two versions. When I performed a merge for a folder that
contains text and binary files from different branches (using v.1.11.17
with the following command):

cvs up -jbranch1 -jbranch2 foldername

I found that if the file in conflict is binary, CVS does not create its
backup file. Initially I thought CVS will create a backup for a
conflicted file, regardless if it is binary or not. I also notice that
this behavior does not exist in CVS 1.11.1p1 which creates the backup
file even for binary file during merging operation resulting in
conflict.

Does anyone know whether this particular behavior change is
deliberately or intentionally done by the developer(s), and if it is so
for what reason? I ask this question because some scripts that we are
using will not work if the CVS backup files are missing during
conflicted merge. I'd really appreciate if someone who knows the answer
could help me on this.


Thanks in advance!


--Ridha