[cvsnt] Mergepoints & Binary files

[Harrison, Andrew]

Hi,

I know that CVS cannot merge binary files, but it should be able to handle
mergepoints on binary files, shouldn't it?

I tried the following:

1. Create a branch
2. Add binary file to trunk
3. Merge trunk->branch (binary file gets created correctly in branch).
Commit.
4. Merge branch->trunk.
  At this point the binary file is merged back in again to the trunk. Surely
because there has been no change on the branch (or the trunk) since the
previous mergepoint, CVS should not even try to do the merge so the fact
that it is a binary file is redundant?

Regards,
Andy

--
Andy Harrison - Platform Software Engineer 
Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK
[http://www.anite.com/telecoms]
"No matter how bad things seem... nothing could be worse than being used as
a towel rail." - A.A. Milne


Please note that my email domain has changed from @anitetelecoms.com to
@anite.com 
Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue,
Slough, Berkshire SL1 4PF, United Kingdom 





Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.