[cvsnt] Yet another obscure merge problem

Harrison, Andrew andy.harrison at anite.com
Fri Feb 27 15:20:25 GMT 2004


> From: Tony Hoyle [mailto:tmh at nodomain.org]
>
> >If I download the CVS source can you give me some pointers 
> for where to
> >start looking? I'd like to have a go at a patch, that would 
> probably be more
> >helpful than just sitting here moaning!
> >
> It's in update.c, in the join_file routine.  

Thanks.
 
> Does the -f option to update change things?  It's one of those options
> that normally doesn't seem to have a lot of point but might work in
> your case.

I'll have a go, what does it do?

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