[cvsnt] More merging problems
andy.harrison at anite.com
Mon Feb 16 16:19:22 GMT 2004
> From: Tony Hoyle [mailto:tmh at nodomain.org]
> Hmm... That's a fairly odd combination of updates but it is a bug.
> It really shouldn't do any merge at all (since the branch isn't live
It seems odd when you are just dealing with a single file, but when merging
entire branches it can easily happen.
> It'll be fixed in the next release.
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
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