platform-vcm-home/2_1_testing.html

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1, Mon Feb 24 15:52:21 2003 UTC revision 1.2, Mon Feb 24 16:03:35 2003 UTC
# Line 132  Line 132 
132    <li>Performance with large trees expanded</li>    <li>Performance with large trees expanded</li>
133    <li>Collapse large tree, exit workspace, restart (should not be as expensive    <li>Collapse large tree, exit workspace, restart (should not be as expensive
134   as if tree had been left expanded)</li>   as if tree had been left expanded)</li>
135      <li>Close a decorated project and then open it.
136  </ol>  </ol>
137    
138  <h3>Patching</h3>  <h3>Patching</h3>
# Line 369  Line 370 
370  have  developer 1 perform a sync. In this case developer 1 should not see  have  developer 1 perform a sync. In this case developer 1 should not see
371  the incoming  change.</p>  the incoming  change.</p>
372    
   
 <h1>Section 3: Migration from 2.0 to 2.1</h1>  
    The below tests require a workspace created using 2.0 which contains  
  projects checked out from a CVS repository.<br>  
 <h3>Migrating a workspace project created using 2.0 to 2.1</h3>  
 <ol>  
   <li>Start Eclipse 2.1 on top of a workspace from 2.0</li>  
   <li>Select a project that was shared with a CVS repository and chose Team/Share  
  Project&#8230;</li>  
   <li>Select the Repository location to share with or enter it if it does  
  not appear in the list.</li>  
   <li>Upon finish, the user will be prompted to select either HEAD or the  
  branch to compare against. </li>  
   <li>The Synchronize view will then be opened and all files will appear  
 as incoming, outgoing or conflicting additions.</li>  
   <li>To see the real conflicts, enable &#8220;Compare File Contents&#8221; available  
  from the drop down menu in the title bar of the Synchronize View.</li>  
   <li>Resolve the real incoming, outgoing additions &nbsp;and conflicts as  
 appropriate (see sync view test plan for a description of sync state resolution)</li>  
   <li>When all conflicts are resolved, disable &#8220;Compare File Contents&#8221; and  
  perform an &#8220;Override and Update&#8221; on the remaining conflicting additions to  
  update the sync info of the local resources.</li>  
   <li>Ensure local copy contains the proper contents (can use Compare With/Latest  
  from Repository)<br>  
   </li>  
 </ol>  
   
373  <h1>Section 4: Branching and Merging</h1>  <h1>Section 4: Branching and Merging</h1>
374  <h2>Main branching scenario</h2>  <h2>Main branching scenario</h2>
375     Here's the main sequence of steps performed over the life cycle of a simple     Here's the main sequence of steps performed over the life cycle of a simple
# Line 433  Line 407 
407  <h3>Merge from Head to a branch</h3>  <h3>Merge from Head to a branch</h3>
408     Make some changes to a branch and to HEAD. Merge the changes from HEAD     Make some changes to a branch and to HEAD. Merge the changes from HEAD
409  into the branch before merging the branch with HEAD.  into the branch before merging the branch with HEAD.
410    
411    
412    <h1>Section 3: Migration from 2.0 to 2.1</h1>
413       The below tests require a workspace created using 2.0 which contains
414     projects checked out from a CVS repository.<br>
415    <h3>Migrating a workspace project created using 2.0 to 2.1</h3>
416    <ol>
417      <li>Start Eclipse 2.1 on top of a workspace from 2.0</li>
418      <li>Select a project that was shared with a CVS repository and chose Team/Share
419     Project&#8230;</li>
420      <li>Select the Repository location to share with or enter it if it does
421     not appear in the list.</li>
422      <li>Upon finish, the user will be prompted to select either HEAD or the
423     branch to compare against. </li>
424      <li>The Synchronize view will then be opened and all files will appear
425    as incoming, outgoing or conflicting additions.</li>
426      <li>To see the real conflicts, enable &#8220;Compare File Contents&#8221; available
427     from the drop down menu in the title bar of the Synchronize View.</li>
428      <li>Resolve the real incoming, outgoing additions &nbsp;and conflicts as
429    appropriate (see sync view test plan for a description of sync state resolution)</li>
430      <li>When all conflicts are resolved, disable &#8220;Compare File Contents&#8221; and
431     perform an &#8220;Override and Update&#8221; on the remaining conflicting additions to
432     update the sync info of the local resources.</li>
433      <li>Ensure local copy contains the proper contents (can use Compare With/Latest
434     from Repository)<br>
435      </li>
436    </ol>
437    
438  </body>  </body>
439  </html>  </html>
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2