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.
Herb Croken wrote: > Ok, maybe I am doing something wrong. > Here is what I tried: > cvs upd -A -C > cvs -j'branchname' -jHEAD > Nothing happened, so I did A lot will have happened, unless there is no difference between the branch and HEAD. > cvs upd -jHEAD -j'branchname' That just reversed the process. > Lots happened :) but > cvs ci -m "message" failed with loads of conflicts You shouldn't get conflicts on a two-revision -j (assuming the files are unmodified, which should be true after the first command). Tony