[cvsnt] Mergepoint issues on 126.96.36.199 b2382
andy.harrison at anite.com
Wed Jan 10 11:08:22 GMT 2007
Thanks for that Tony. Yes, that does seem to be the problem exactly.
Looking at Tony Hoyle's reply to your question, it looks like this
feature was deliberately disabled. Until recently we've been using
2.0.58d and this worked fine. Tony H mentioned that there were scenarios
where people lost data. Fortunately this never happened to us and we've
been using this feature for a number of years. We use Bi-directional
merging all the time (generally referred to as re-basing).
Does anyone (Tony H, Glen) know which was the *last* stable version of
CVS to have this feature enabled? And is a download available anywhere?
I don't really want to go back to 2.0.58d, but we are having a lot of
problems due to the lack of this feature. Specifying the two -j's des
work, but since we have several years of only doing one, it's hard to
make sure all the engineers always do two.
Andy Harrison - Platform Software Engineer
Anite Telecoms Ltd. Ancells Business Park, Fleet, Hampshire, GU51 2UZ,
"No matter how bad things seem...
...nothing could be worse than being used as a towel rail." - A.A. Milne
A member of the Anite Group of companies. Please refer to www.anite.com for individual Anite company details. The contents of this e-mail and any attachments are for the intended recipient only. If you are not the intended recipient, you are not authorised to and must not disclose, copy, distribute, or retain this message or any part of it. It may contain information which is confidential and/or covered by legal professional or other privilege. Contracts cannot be concluded with us nor legal service effected by email.
Anite Group plc
Registered in England No.1798114
Registered Office: 353 Buckingham Avenue Slough Berks SL1 4PF United Kingdom
VAT Registration No. GB 787 418187
Scanned for viruses by BlackSpider MailControl.
More information about the cvsnt