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.
No, the cvs update -j HEAD -j sometag will calculate the reverse diff from HEAD to sometag and then apply that to HEAD effectively replacing the HEAD files with the tagged file contents. There will not be any conflicts because you should start out with a stable non-edited sandbox. The same can be done by: 1. Update the sandbox to sometag 2. Copy all files to some safe place 3. Update and reset sticky tags to get to HEAD 4. Copy back the files from 2) 5. Commit the now changed files The drawback is that now there will be no mergepoints created and you will not be able to see in WinCvs or ViewCvs that in fact the intermediate revisions got bypassed. I think that the merging update also can handle the fact that a file was added after the tagging, I believe it will be removed in this case, but I am not sure (has to be tested). Bo -----Original Message----- From: Merrill Cornish [mailto:merrill.cornish at earthlink.net] Sent: den 27 april 2005 15:32 To: Bo Berglund; assaf; cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: RE: [cvsnt] discard garbage revisions and create new 'latest' basedonold tag. Bo, >>> update with merge command "Merge" makes it _sound_ like the good code in the tagged revisions will be merged with the garbage code, thereby preserving the garbage except for the lines where the tagged revisions and the garbage happen to conflict. Merrill