[cc-devel] svn gurus
fourstones.net at gmail.com
Sun Sep 30 21:42:15 EDT 2007
sorry if I'm going too wide with this but I'd prefer to get this right...
I'd like to create an svn branch in the cchost tree where I will make
radical changes (move files around, create/destroy directories, etc.)
-- this branch may become the mainline source (trunk) some day but we
don't know that for sure.
Stop me if I've missed something...
I've read the svn docs and I gather that changes in the trunk have to
be manually merged into the branch, but that at least the stat log
will give me a heads up if that needs to happen.
Devs who want to work in the new branch do so using svn switch
If all goes well there is no svn operation to make the branch into the
trunk. So it seems the best way is to
a) create a local svn working dir with the current trunk
b) grab a copy of the branch into into a non-svn tree
c) create create a branch (snapshot) of the trunk in the repository
d) use svn delete to wipe out files and dirs in (a)
e) copy the branch files/dirs into (a) and do add/commits
This could destroy diff ancestry if (d) deletes a share file/dir but I
hope that's the worst price to pay.
Is this making sense?
More information about the cc-devel