Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to firstname.lastname@example.org.
> From: Glen Starrett [mailto:grstarrett at cox.net] > > --Create a branch b2, already have branch grs-test1. > > --Change sandbox to b2, Add a file into b2, commit > > --Change sandbox to grs-test1 > > --Merge from b2 > --> I now see the test file. Ok, that's exactly it. But now look at the CVS headers of the file in grs-test1. Does it have a mergepoint flag indicating that it was merged from the b2 branch? Mine does not. Try this, following on from what you've done above. --Change sandbox to b2 --Modify the file, commit --Change sandbox to grs-test1 --Merge from b2 --> At this point I get a conflict, and looking at the details it simply shows the entire contents of the file conflicting between the two versions. The only way I can stop this happening is to manually edit the RCS file and add the mergepoint in (nasty!). Rgds 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.