2013-04-30 08:44 AEST by Arthur Barrett -  

2013-04-30 08:45 AEST by Arthur Barrett - Quite often users will start coding a feature on trunk (HEAD) and after starting to change the code realize 
that they probably want to do this on a branch. This is fairly easy to do with something like:

cvs rtag forkName all
cvs rtag -b branchName -r forkName all

Then from the modified workspace, morph it into the created branch:

cvs up -A -r branchName

The problem is that any file that has been added previously is not morphed over to the branch but 
remains "added" to the trunk.

To fix it you can manually fix CVS/Entries, or use this procedure:

  cvs up -A -r branch-1 | grep ^A
  cvs update: Updating .
  A bzzt.txt
  mv bzzt.txt bzzt-1.txt 
  cvs remove bzzt.txt 
  cvs remove: removed `bzzt.txt'
  mv bzzt-1.txt bzzt.txt 
  cvs add bzzt.txt 
  cvs add: scheduling file `bzzt.txt' for addition on branch `branch-1'
  cvs add: use `cvs commit' to add this file permanently
  cvs ci -m "test"


But it's a lot of work for a small payoff.

A much better option would be a new switch on 'cvs update' to reset 'All entries, included added entries'.

2013-04-30 08:52 AEST by Glen Starrett - It would be nice if this could remove the 'removed' flags as well.  You can't
get rid if it currently, short of deleting the module and re-upping it or
committing then restoring the file & re-adding it.

>>>>
C:\Users\Glen Starrett\Documents\test\europa\samp\foo>cvs up -CAdP
cvsntsrv server: Updating .
cvsntsrv server: Updating s1
cvsntsrv server: Updating s2

C:\Users\Glen Starrett\Documents\test\europa\samp\foo>cvs rm -f a.txt
cvsntsrv server: scheduling `a.txt' for removal
cvsntsrv server: use 'cvsntsrv commit' to remove this file permanently

C:\Users\Glen Starrett\Documents\test\europa\samp\foo>cvs up -CAdP
cvsntsrv server: Updating .
R a.txt
cvsntsrv server: Updating s1
cvsntsrv server: Updating s2

C:\Users\Glen Starrett\Documents\test\europa\samp\foo>cvs up
cvsntsrv server: Updating .
R a.txt
cvsntsrv server: Updating s1
cvsntsrv server: Updating s2

C:\Users\Glen Starrett\Documents\test\europa\samp\foo>copy b.txt a.txt
        1 file(s) copied.

C:\Users\Glen Starrett\Documents\test\europa\samp\foo>cvs up
cvsntsrv server: Updating .
cvsntsrv server: a.txt should be removed and is still there
R a.txt
cvsntsrv server: Updating s1
cvsntsrv server: Updating s2
<<<<