This thread has been locked.

If you have a related question, please click the "Ask a related question" button in the top right corner. The newly created question will be automatically linked to this question.

ccsv4 + version control + multiple branches = :(

We're using ccsv4 to debug and program C28xxx DSP's, along with a set of external build scripts. The projects are checked into Subversion for version control. Works great...

...except suppose you have two or more simultaneous checkouts:

/myproj/trunk/         checkout of trunk

/myproj/branches/test      feature branch to update some new feature, just varies one of the .cpp files

 

When kept synchronized, these contain the same .project file. But Code Composer doesn't let you import an existing project when the .project files contain the same project name.

What should we do? We need to keep things in SVN. The option of keeping the .project file out of SVN is not a good one; neither is trying to keep the .project files different when merging branches.