title: How to merge two seperate - yet similar - codebases into one SVN rep?
body: <p>I have</p>
  
  <p>/var/www/cool_codebase on www.example.com AND I have</p>
  
  <p>/var/www/cool_codebase on www.example.net</p>
  
  <p>The codebases are for the same web app running on different servers. There is <em>some</em> specialisation between the codebases (client-specific bits and bobs etc) - but not too much. One codebase has files that the other doesn't and vice-versa. Some bits of programming are different too.</p>
  
  <p>I have downloaded each codebase to my localhost and my question is:</p>
  
  <p>How can I merge these two folders into one folder and then commit it as one "grand unified codebase" into my SVN?</p>
  
  <p>Should I put each codebase into its own SVN repo, and then merge these separate repos? Or can I merge the codebases <em>before</em> SVN - using some linux command for example - and <em>then</em> commit it to SVN?</p>
  
  <p>Any ideas or help would be greatly appreciated.</p>
  
  <p>I should add that the end result would be ONE "grand unified codebase" that we can deploy to both www.example.com and www.example.net with no hiccups.</p>
  
  <p>(PS. Yes, I realise that whatever I do I'll have to edit some of the files and make the programming "generic" and so on. I don't mind this. I'm simply looking for ways to automate or semi-automate the whole thing.)</p>