title: TF30073 can't perform undo on an overwrite file merge wsdl
body: <p>I have the following problem:</p>
  
  <ol>
  <li>Finished some work on the main line ( WebService and an app that consumes it)</li>
  <li>I wanted to merge my changes on a branch, so I use the merge option.</li>
  <li>While compiling it turns out that there were diferences on the webservice, so I add the webmethods that are required on the asmx.cs file.</li>
  <li>I Update the web service reference on the app that consumes it</li>
  <li>PROBLEM: I can't checkin the wsdl or perform an undo over it. So I'm stuck.
  the message i get is TF30073 SQL Error 515</li>
  </ol>
  
  <p>TF30073: Please contact your administrator. There was an error processing your request
  Technical information SQL Error: 515</p>
  
  <ol>
  <li>I tried make a baseless branch over only these 2 files with no luck.</li>
  <li>I try to rename it (which only did things worst) now I also get the error:</li>
  </ol>
  
  <p>TF10210: Source control encountered an error during undo operation:</p>
  
  <p>BTW </p>
  
  <ol>
  <li>now i realize that merge is meant to be done only on straightforward changes.</li>
  <li>i wouldn't like to regenerate the web reference with different names as we are a bunch of developers, but that's my last option for later tonight :).</li>
  </ol>