title: Managing svn repository - automatic merging or patching?
body: <p>I've got problem with manage svn repository in our company.
  We cooperate with outsourcing programmers - they develop software and send it every week to us. 
  But now there are some programmers in our company - and they write some new functions for this software. This outsourcing company haven't got access to our changes. </p>
  
  <p>I have problem with merging these versions.</p>
  
  <p>Should I create patches with our changes, or... what approach should I have?
  What if there will be conflicts? (I'm sure, there will be some conflicts)</p>
  
  <p>I would automate this...</p>