Re: cvs update not handling binary files with conflicts correctly

[Arno Schuring]

[...]

> When the update command is run it says that there is a conflict in the
> WORD.tar (binary file). But when I ran cvs -nq update after the
> changes are merged it shows that the Binary file has no conflicts. It
> is supposed to mark it with a 'C' right?

CVS already told you...

> $ cvs -f up -d -kk -j TAG1 -j TAG2 WORD.tar test9.txt
> cvs update: nonmergeable file needs merge
> cvs update: revision 1.1.2.2 from repository is now in WORD.tar
> cvs update: file from working directory is now in .#WORD.tar.1.1.4.2

Which basically means that the WORD.tar revision is now the same as in the 
repository. If you want to create your conflict again, do a
$ mv .#WORD.tar.1.1.4.2 WORD.tar

and run cvs up

Arno



 np: Marillion - The Fruit Of The Wild Rose