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.
Thomas Bergmann wrote: > # merge to patch to main branch > cvs update -A > cvs update -d -j rel-1-0 -j rel-1-0-patches > cvs -q commit -m "merge files" file1.txt file2.txt > > # merge point on file2 is missing There's not supposed to be one there, as it's a two -j merge. > cvs -q update -r rel-2-0-patches > cvs -q update -d -j rel-1-0 -j rel-1-0-patches > Same there. Tony