[cvsnt] Re: Easiest/best way to make a branch the trunk (no merging)

Glen Starrett grstarrett at cox.net
Thu Jul 1 21:08:10 BST 2004

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.

Chris Morris wrote:
> Scenario: bulk of the team on a branch, one member on the trunk, now we 
> want to abandon what's been done on the trunk and when we're done with 
> the branch make the branch the trunk.

You could:

  --export the branch to another directory
  --co the trunk
  --copy the exported branch files on top of the trunk
  --add any new files
  --rm any removed ones
  --ci and now the trunk is identical to the branch.

> Or this: we simply want to rollback everything on the trunk to the point 
> in time we made the branch.

To do this:

  --from the trunk, up -j <branchpoint> (I'm not sure how to identify 
the branchpoint!  Maybe you have a tag at that point?  Know the date?)
  --up -j <branch>

Now you're up to date with the branch.

Glen Starrett

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook