Hi!
WARNING: Long complicated email ahead :)
Act 1,
Scene 1,
1) mydir\Readme.txt file exists in trunk
2) BUGFIX Branch created
3) File edited and commited multiple times in Trunk
4) File edited and commited multiple times in Branch.
5) File has been merged into the trunk as well.
Scene 2
1) We on the trunk have decided on a huge restructure of the directories and the
general environment in general
2) It is very important that we retain all the trunk revisions and logs etc
3) But it is okay to lose the branch information in the new directory structure
4) Branch should exist like nothing has ever changed.
Act 2
Scene 1
1) Aditya (the CVS administrator) plans the following ->
Create the new directory structure in the CVS respository
Copy the comma,v files into the new directory structure
As a user,
On the trunk,
cvs remove and commit the old directory structure.
This will stop us from doing development on the old directory
structure on the trunk, but the branch revisions stay alive.
cvs co the new directory structure
cvs tag -d BUGFIXES new-directory structure
1.1) <Obsolete the branch revisions on the new directory structure>
Scene 2
1) Since the new directory structure is not tagged .. it will not exist on the
branch!! (We want that)
2) No development on the old directory structure possible on the trunk as it has
been cvs removed on the trunk
3) Revision histories and logs still present for the files within the new
directory structure.
Problem solved? Am I right?
My problem is 1.1 .. How can i completely obsolete the branch revisions from the
files in the new directory structure.
I think i'll need to use "cvs admin -o -r<some range> to obsolete branch
revisions"
Any idea how I can fetch (and then obsolete all branched revisions)?
thanks,
aditya
