[cvsnt] Re: Mergepoints & Binary files

Harrison, Andrew andy.harrison at anite.com
Fri Jun 4 14:10:48 BST 2004


> From: Tony Hoyle [mailto:tmh at nodomain.org]
> >>
> >> As binary files are never merged, there's never a mergepoint.
> >
> >Really? When I do a cvs log on a binary file, the 
> mergepoints appear where I
> >would expect them to.
> >
> That's just the data passing from the client to the server during
> commit.  It doesn't actually do anything...

It's not just during the commit. The "mergepoint1 @1.1@;" line appears in
the rcs file the same as for text files. Is there something else that I'm
missing?

Regards,
Andy

--
Andy Harrison - Platform Software Engineer 
Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK
"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.


More information about the cvsnt mailing list