Hi, Hope there is a solution for my scenario - any ideas/comments will be appreciated. (Running svn 1.8 in windows env mainly using tortoisesvn as client) I'm using the feature branch approach where trunk is stable and developers create branches to dev new features; Featrure branch is tested on its own before reintegration into trunk. This approach requires a rebase action as some projects tend to take longer. I wrote a windows bat file to handle all all processes to assist developers which are not as savvy with svn concepts / commands:
- create new branch a (ver 1): svn copy trunk branch/a_v1
- rebase: create branch a_v2 as copy from trunk , checkout, merge all changes from branch a_v1 to a_v2, commit changes , switch to a_v2 (archive a_v1)
- reintegrate: merge all changes from a_v2 to trunk, commit
- remove link to "globals" (propdel svn:externals)
- make a local copy of the "globals" folder (svn export...)
- add folder to branch (svn add..)