title: Team Foundation Server: Roll back to a changeset and include my changes afterwards
body: <p>I have a problem regarding changes in a project. I will try to give a simplified example on what the situation is and what I want to achive.</p>
  
  <p>Lets say I got a project from a coworker to assist him in certain changes to be made. I check out the project from the TFS, the changeset is 4711.</p>
  
  <p>The project consists of many windows forms like this:</p>
  
  <pre><code>frm_example01.vb
  frm_example02.vb
  [...]
  frm_example45.vb
  </code></pre>
  
  <p>I make my changes to the project, which are put into subfolders which makes them easy to identify, so I now have this structure:</p>
  
  <pre><code>DATA
   -&gt; DataClass1.vb
   -&gt; DataClass2.vb
  frm_example01.vb
  frm_example02.vb
  [...]
  frm_example45.vb
  </code></pre>
  
  <p>I checked in my changes in several stages but they are all incuded and we are now at chageset 4720. I did not touch the original forms, however I did change the project to VB Option Strict, making some typeconversions necessary in almost every file.</p>
  
  <p>Now my my coworker insist that changing to strict breaks his project (though it is a bit more complicated in reality). So what I try to do now is reverting to the last changeset without any changes from me (4711), and then only apply my classes in the subfolder to it.</p>
  
  <p>How can I achive reverting to the cangeset 4711 and then only apply my changes, without the changes resulting from the conversion to option strict?</p>
  
  <p>As I understand it the TFS can only merge changesets following each other directly, so this can not be done, or am I wrong at this?</p>
  
  <p>I have already tried to save my classes manually, reverted my working copy to 4711, and after that to create them manually again, but because files of that name are known in the tfs, I am not allowed to create the classes again by the same name.</p>
  
  <p>Any ideas on this would be greatly apreciated.</p>
  
  <p>Best regads.</p>