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 sales@march-hare.com.
James Neave wrote: > [Corrected] > > Hi, > > Right, > > If I perform merge A and this merges change X into HEAD [Correction, > used HEAD and development branch, I mean the same thing, HEAD] > Then release and remove the working directory, change X was not checked > into HEAD. > Will that change get merged if I merge again (merge B) If you didn't check in as far as cvs is concerned the merge didn't happen. > So a clean copy of HEAD (no changes merged in, but some practises > performed) merged with v1_1_patches using the -b switch will merge every > change made from the branch point (v1_1) up to the end of the branch? Yes. Tony