subversion diff and merge two sepearte respositories

[Niheel]

I have two seperate repositories of one project, one's a copy of a production version of the project and one's a copy of the development version of the product.

What is the best way to diff both versions, and then merge them into one repository?

I am using a local VisualSVN server with Netbeans on a Vista system.
Beginner skill level on both netbeans and svn.

[chaarmann]

You can make a parameter file and put in version=develop ment or version=product ion. Then you need only a single repository and your code looks like "if version=product ion then do this else do that".
But if the source code is really different (2 different lines instead of if-else-construct) then it's best to use 2 repositories (I mean 2 trunks). If you make a new feature, then do it as a branch and merge this branch back into both trunks.
Or you can have 3 trunks. One with the "common" code, one with the development-specific code and one with the production-specific code. And then you merge 2 trunks of the code everytime before starting to work, but I wouldn't recommend that. My recommendation is the parameter file.

[Niheel]

Thanks chaarman, i think we will go with go with two trunk approach for the time being. When we get time, will merge everything into one.