SVN/ Subversion Tips and traps

SVN could be tricky and waste a hell lot of time.

Case Issue :
Normally we run SVN server in linux. Our dev env will be in windows NT. Windows doest differentiate lower and upper case file names, while linux does. So when we try to do a SVN update, it gives wierd errors like Lock not released, while the problem is with Case.
This takes hours to sort out.


Merge branch to trunk
Often in a multi developer environment, it is required to maintain seperate branches so that the development is
not dependent on another developer. The developer takes a branch , works on his module and once done and tested,
merges it back to trunk.

Using tortoise svn, this can be achieved as follows:
1. right click on the root folder of your svn dump. Click merge .
2. Choose the revision from to for the branch (use show log to aid in choosing revision).
3. Make a diff. Do a dry run. Finally hit merge when satisfied.
4. Now the branch on ur local disk has the merged content. This can be commited to the trunk normally using commit.



More to come here.