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 email@example.com.
Tony Eva wrote: > Gerhard Fiedler wrote: > >> Well, come to think of it, I probably could use the merge command to >> merge back from bMyBranch to HEAD, discard the merge results and >> replace the files on HEAD (after the merge but before the associated >> commit) with the files of the branch. I guess that would be one way to >> do it -- but is there a more straightforward way? > > I think you want 'cvs update -jbMyBranch -jHEAD' (or the -j options > might be the other way round?). Refer to Tony Hoyle's post from last > year dated Wed 07/06/2006 14:06. Sounds like this one <http://www.cvsnt.org/pipermail/cvsnt/2006-June/025292.html>. The options are reversed. I had forgotten about this since then. I need to try this so that I don't forget it :) Thanks. I added a FAQ entry <http://tinyurl.com/3c2arw>. Gerhard