platform-vcm-home/2_0_testing.html
Parent Directory
| 
Revision Log
Revision 1.5 - (view) (download) (as text)
| 1 : | kevinm | 1.1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
| 2 : | <html> | ||
| 3 : | <head> | ||
| 4 : | mvalenta | 1.4 | |
| 5 : | kevinm | 1.1 | <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css"> |
| 6 : | <title>Team Testing Roadmap</title> | ||
| 7 : | mvalenta | 1.4 | |
| 8 : | kevinm | 1.1 | <meta name="author" content="OTI Employee"> |
| 9 : | mvalenta | 1.4 | |
| 10 : | kevinm | 1.1 | <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"> |
| 11 : | </head> | ||
| 12 : | mvalenta | 1.5 | |
| 13 : | <body> | ||
| 14 : | |||
| 15 : | kevinm | 1.1 | <h1>Section 1: General CVS Tests</h1> |
| 16 : | mvalenta | 1.5 | |
| 17 : | <h2>CVS Repositories View</h2> | ||
| 18 : | |||
| 19 : | <h3>Adding and Discarding Locations</h3> | ||
| 20 : | These test require an existing repository which contains projects. | ||
| 21 : | <ol> | ||
| 22 : | <li>Add a location to the view.</li> | ||
| 23 : | <li>Ensure that invalid location information is handled properly in the New Location Wizard.</li> | ||
| 24 : | <li>View location properties page and ensure that information is correct and can be changed.</li> | ||
| 25 : | <li>Also change property values when local projects are shared with the location and ensure | ||
| 26 : | the project's sharing information is changed when the location's properties are changed. | ||
| 27 : | <li>Discard a location and ensure it is removed. Also ensure that discarding is not permitted when | ||
| 28 : | projects in the local workspace are shared with the location.</li> | ||
| 29 : | </ol> | ||
| 30 : | |||
| 31 : | <h3>Project Checkout</h3> | ||
| 32 : | These test require an existing repository which contains projects, at least one of which | ||
| 33 : | does not contain a .project file. | ||
| 34 : | <ol> | ||
| 35 : | <li>Perform "Checkout as Project". Ensure that repeating results in overwrite prompt.</li> | ||
| 36 : | <li>Perform "Checkout as..." and enter custom name and/or custom location.</li> | ||
| 37 : | <li>Perform "Checkout as..." on a remote project that does not have a .project file and | ||
| 38 : | ensure that the user is prompted for project type to create.</li> | ||
| 39 : | </ol> | ||
| 40 : | |||
| 41 : | <h3>Browsing Tags</h3> | ||
| 42 : | These test require an existing repository which contains projects that have been tagged with both | ||
| 43 : | version and branch tags. | ||
| 44 : | <ol> | ||
| 45 : | <li>Perform "Configure Branches and Versions..." and select some branch and version tags to be remembered.</li> | ||
| 46 : | <li>Expand the respositories entry to view ... | ||
| 47 : | <ul> | ||
| 48 : | <li>projects in HEAD,</li> | ||
| 49 : | <li>branches and projects in BRANCHES,</li> | ||
| 50 : | <li>projects and versions in VERSIONS.</li> | ||
| 51 : | </ul> | ||
| 52 : | <li>Perform "Checkout as..." on a remote project that does not have a .project file and | ||
| 53 : | ensure that the user is prompted for project type to create.</li> | ||
| 54 : | </ol> | ||
| 55 : | |||
| 56 : | <h3>Working with modules</h3> | ||
| 57 : | These tests require a CVSROOT/modules file on the server that contains valid module definitions. | ||
| 58 : | <ol> | ||
| 59 : | <li>Switch the Repositories View to Show Modules mode and ensure that the moduels are displayed properly.</li> | ||
| 60 : | <li>Perform "Checkout as Module" and ensure that the module is checkout out properly. | ||
| 61 : | Also ensure that repeating results in overwrite prompt.</li> | ||
| 62 : | </ol> | ||
| 63 : | |||
| 64 : | <h2>Project Sharing</h2> | ||
| 65 : | |||
| 66 : | kevinm | 1.1 | <h3>Project sharing and disconnecting</h3> |
| 67 : | <ol> | ||
| 68 : | <li>Sharing with no CVS folders against existing project</li> | ||
| 69 : | <li>Sharing with CVS folders</li> | ||
| 70 : | <li>Sharing new project with no CVS folders</li> | ||
| 71 : | <li>Disconnect: keeping and deleting CVS folders, reconnecting (as above)</li> | ||
| 72 : | </ol> | ||
| 73 : | mvalenta | 1.5 | |
| 74 : | <h3>Project sets</h3> | ||
| 75 : | <ol> | ||
| 76 : | <li>Create one, delete projects, load set and ensure got projects back</li> | ||
| 77 : | <li>Test against HEAD, project on branch/version.</li> | ||
| 78 : | </ol> | ||
| 79 : | |||
| 80 : | <h2>CVS workflow</h2> | ||
| 81 : | |||
| 82 : | <h3>Common workflows</h3> | ||
| 83 : | |||
| 84 : | To perform the tests properly, check out the same remote project into two local projects. | ||
| 85 : | |||
| 86 : | <ol> | ||
| 87 : | <li>Commit and Update with incomming, outgoing and conflicting changes and ensure proper behavior.</i> | ||
| 88 : | <li>Update/commit with very large files (> 8 meg)</li> | ||
| 89 : | <li>Replace with (latest, base, branch, version, revision)</li> | ||
| 90 : | <li>Compare with (latest, base, branch, version, revision)</li> | ||
| 91 : | <li>Ensure you are prompted for unsaved changes before performing a CVS action</li> | ||
| 92 : | <li>Tag as Version and ensure that remote is tagged properly.</li> | ||
| 93 : | <li>Tag as Version with dirty local resources and ensure proper prompting.</li> | ||
| 94 : | <li>Change ASCII/Binary Property on projects and resources and ensure proper behavior.</li> | ||
| 95 : | </ol> | ||
| 96 : | |||
| 97 : | <h3>Ignoring resources</h3> | ||
| 98 : | kevinm | 1.1 | <ol> |
| 99 : | <li>Ignoring resources</li> | ||
| 100 : | mvalenta | 1.4 | <li>“Add to .cvsignore”</li> |
| 101 : | kevinm | 1.1 | <li>Add to global ignore list, ensure its now ignored</li> |
| 102 : | </ol> | ||
| 103 : | mvalenta | 1.5 | |
| 104 : | kevinm | 1.1 | <h3>Decorators</h3> |
| 105 : | <ol> | ||
| 106 : | <li>Change all the options, apply, see them redraw correctly</li> | ||
| 107 : | <li>Add/remove items, ensure dirty markers update</li> | ||
| 108 : | <li>Add to version control and see decorator change</li> | ||
| 109 : | <li>Performance with large trees expanded</li> | ||
| 110 : | mvalenta | 1.4 | <li>Collapse large tree, exit workspace, restart (should not be as expensive |
| 111 : | as if tree had been left expanded)</li> | ||
| 112 : | kevinm | 1.1 | </ol> |
| 113 : | mvalenta | 1.5 | |
| 114 : | kevinm | 1.1 | <h3>Patching</h3> |
| 115 : | mvalenta | 1.4 | Creating patches and then comparing with them. In particular, |
| 116 : | kevinm | 1.1 | <ol> |
| 117 : | <li>added files</li> | ||
| 118 : | <li>deleted files</li> | ||
| 119 : | <li>added or deleted folders with added or deleted files in them</li> | ||
| 120 : | <li>binary files</li> | ||
| 121 : | </ol> | ||
| 122 : | mvalenta | 1.5 | |
| 123 : | <h3>Working with Modules</h3> | ||
| 124 : | These test require valid moduel definitions in the CVSROOT/modules file of the repository | ||
| 125 : | <ol> | ||
| 126 : | <li>Checkout a module and ensure success.<li> | ||
| 127 : | <li>Perform other CVS tests on the local project as if it were a regular project.</li> | ||
| 128 : | </ol> | ||
| 129 : | |||
| 130 : | kevinm | 1.1 | <h3>Misc</h3> |
| 131 : | <ol> | ||
| 132 : | mvalenta | 1.5 | <li>Mixing tags within a project.</li> |
| 133 : | <li>Propertoes pages for projects, folders and files.</li> | ||
| 134 : | kevinm | 1.1 | <li>CVS Console: ensure written to</li> |
| 135 : | <li>Check canceling everywhere there's a progress monitor</li> | ||
| 136 : | <li>Does it cancel in reasonable time?</li> | ||
| 137 : | <li>Is the workspace in an ok state after?</li> | ||
| 138 : | <li>Compression switches, ensure data transfered ok (commit, update)</li> | ||
| 139 : | </ol> | ||
| 140 : | mvalenta | 1.5 | |
| 141 : | kevinm | 1.1 | <h1>Section 2: CVS Synchronize View</h1> |
| 142 : | <table height="124" border="1" width="99%"> | ||
| 143 : | mvalenta | 1.4 | <tbody> |
| 144 : | <tr> | ||
| 145 : | <td width="25%"><b>Change Type</b></td> | ||
| 146 : | <td width="25%"><b>Action</b></td> | ||
| 147 : | <td width="50%"><b>Result</b></td> | ||
| 148 : | </tr> | ||
| 149 : | <tr> | ||
| 150 : | <td width="25%"><b>Incoming File Change</b></td> | ||
| 151 : | <td width="25%">Update</td> | ||
| 152 : | <td width="50%">Remote contents become local. Try with both Text and | ||
| 153 : | Binary files.</td> | ||
| 154 : | </tr> | ||
| 155 : | <tr> | ||
| 156 : | <td width="25%"><b>Incoming File Change</b></td> | ||
| 157 : | <td width="25%">Override and Commit</td> | ||
| 158 : | <td width="50%">Only in Both mode. Prompt for release comment. Cancel | ||
| 159 : | aborts, OK commits local file to server.</td> | ||
| 160 : | </tr> | ||
| 161 : | <tr> | ||
| 162 : | <td width="25%"><b>Incoming File Addition</b></td> | ||
| 163 : | <td width="25%">Update</td> | ||
| 164 : | <td width="50%">Remote contents become local. Try with both Text and | ||
| 165 : | Binary files.</td> | ||
| 166 : | </tr> | ||
| 167 : | <tr> | ||
| 168 : | <td width="25%"><b>Incoming File Addition</b></td> | ||
| 169 : | <td width="25%">Override and Commit</td> | ||
| 170 : | <td width="50%">Only in Both mode. Prompt for release comment. Cancel | ||
| 171 : | aborts, OK commits deletion to server.</td> | ||
| 172 : | </tr> | ||
| 173 : | <tr> | ||
| 174 : | <td width="25%"><b>Incoming File Deletion</b></td> | ||
| 175 : | <td width="25%">Update</td> | ||
| 176 : | <td width="50%">Local file is deleted.</td> | ||
| 177 : | </tr> | ||
| 178 : | <tr> | ||
| 179 : | <td width="25%"><b>Incoming File Deletion</b></td> | ||
| 180 : | <td width="25%">Override and Commit</td> | ||
| 181 : | <td width="50%">Only in Both mode. Prompt for release comment. Cancel | ||
| 182 : | aborts, OK commits local file to server.</td> | ||
| 183 : | </tr> | ||
| 184 : | <tr> | ||
| 185 : | <td width="25%"><b>Outgoing File Change</b></td> | ||
| 186 : | <td width="25%">Commit</td> | ||
| 187 : | <td width="50%">Prompt for release comment. Cancel aborts, OK commits | ||
| 188 : | local file to server.</td> | ||
| 189 : | </tr> | ||
| 190 : | <tr> | ||
| 191 : | <td width="25%"><b>Outgoing File Change</b></td> | ||
| 192 : | <td width="25%">Override and Update</td> | ||
| 193 : | <td width="50%">Only in Both mode. Remote contents become local. Try | ||
| 194 : | with both Text and Binary files.</td> | ||
| 195 : | </tr> | ||
| 196 : | <tr> | ||
| 197 : | <td width="25%"><b>Outgoing File Addition</b></td> | ||
| 198 : | <td width="25%">Add to Version Control</td> | ||
| 199 : | <td width="50%">Adds the file to version control. The icon should change | ||
| 200 : | in the sync view, and Commit should now be enabled.</td> | ||
| 201 : | </tr> | ||
| 202 : | <tr> | ||
| 203 : | <td width="25%"><b>Outgoing File Addition</b></td> | ||
| 204 : | <td width="25%">Add to .cvsignore</td> | ||
| 205 : | <td width="50%">Adds the file to .cvsignore. The file should disappear | ||
| 206 : | from the sync view. The .cvsignore file should appear (if it wasn't visible | ||
| 207 : | already). The file should not appear in subsequent syncs.</td> | ||
| 208 : | </tr> | ||
| 209 : | <tr> | ||
| 210 : | <td width="25%"><b>Outgoing File Addition</b></td> | ||
| 211 : | <td width="25%">Commit</td> | ||
| 212 : | <td width="50%">Commit is only enabled on an outgoing addition if it | ||
| 213 : | has first been added to version control. Prompt for release comment. Cancel | ||
| 214 : | aborts, OK commits local file to server.</td> | ||
| 215 : | </tr> | ||
| 216 : | <tr> | ||
| 217 : | <td width="25%"><b>Outgoing File Addition</b></td> | ||
| 218 : | <td width="25%">Override and Update</td> | ||
| 219 : | <td width="50%">Only in Both mode. Local file is deleted.</td> | ||
| 220 : | </tr> | ||
| 221 : | <tr> | ||
| 222 : | <td width="25%"><b>Outgoing File Deletion</b></td> | ||
| 223 : | <td width="25%">Commit</td> | ||
| 224 : | <td width="50%">Prompt for release comment. Cancel aborts, OK commits | ||
| 225 : | deletion to server.</td> | ||
| 226 : | </tr> | ||
| 227 : | <tr> | ||
| 228 : | <td width="25%"><b>Outgoing File Deletion</b></td> | ||
| 229 : | <td width="25%">Override and Update</td> | ||
| 230 : | <td width="50%">Only in Both mode. File is re-created, remote contents | ||
| 231 : | become local.</td> | ||
| 232 : | </tr> | ||
| 233 : | <tr> | ||
| 234 : | <td width="25%"><b>Conflicting File Change</b></td> | ||
| 235 : | <td width="25%">Override and Commit</td> | ||
| 236 : | <td width="50%">Prompt for release comment. Cancel aborts, OK commits | ||
| 237 : | local file to server. Applies to both auto-mergeable and non-mergeable conflicts.</td> | ||
| 238 : | </tr> | ||
| 239 : | <tr> | ||
| 240 : | <td width="25%"><b>Auto-mergeable Conflicting File Change</b></td> | ||
| 241 : | <td width="25%">Override and Update</td> | ||
| 242 : | <td width="50%">Auto-mergeable conflicts have a two-way red/green arrow. | ||
| 243 : | Dialog prompts user to either auto-merge or replace. If user chooses auto-merge, | ||
| 244 : | then remote changes are merged in with local changes. File should still | ||
| 245 : | be dirty, local changes should still be present, CVS markup should not be | ||
| 246 : | present, and no .# files should have been created. If user chooses replace, | ||
| 247 : | then local changes are discarded and remote contents replace local. No .# | ||
| 248 : | files created, no CVS markup, and the file is not dirty as a result. If | ||
| 249 : | the user chooses cancel nothing happens.</td> | ||
| 250 : | </tr> | ||
| 251 : | <tr> | ||
| 252 : | <td width="25%"><b>Non-mergeable Conflicting File Change</b></td> | ||
| 253 : | <td width="25%">Override and Update</td> | ||
| 254 : | <td width="50%">Dialog prompts user to replace local changes. If user | ||
| 255 : | cancels nothing happens. If user chooses OK, then local changes are discarded | ||
| 256 : | and remote contents replace local. No .# files created, no CVS markup, and | ||
| 257 : | the file is not dirty as a result.</td> | ||
| 258 : | </tr> | ||
| 259 : | <tr> | ||
| 260 : | <td width="25%"><b>Conflicting File Addition</b></td> | ||
| 261 : | <td width="25%">Add to Version Control</td> | ||
| 262 : | <td width="50%">Adds the file to version control. The icon should change | ||
| 263 : | in the sync view, and Override and Commit should now be enabled.</td> | ||
| 264 : | </tr> | ||
| 265 : | <tr> | ||
| 266 : | <td width="25%"><b>Conflicting File Addition</b></td> | ||
| 267 : | <td width="25%">Override and Commit</td> | ||
| 268 : | <td width="50%">Override and Commit is only enabled on an outgoing addition | ||
| 269 : | if it has first been added to version control. Prompt to warn of conflicting | ||
| 270 : | changes. If OK, prompt for release comment. Cancel aborts either dialog. | ||
| 271 : | OK commits local file to server.</td> | ||
| 272 : | </tr> | ||
| 273 : | <tr> | ||
| 274 : | <td width="25%"><b>Conflicting File Addition</b></td> | ||
| 275 : | <td width="25%">Override and Update</td> | ||
| 276 : | <td width="50%">Remote contents become local.</td> | ||
| 277 : | </tr> | ||
| 278 : | </tbody> | ||
| 279 : | kevinm | 1.1 | </table> |
| 280 : | <h2>Variations</h2> | ||
| 281 : | <h3>Container Selection</h3> | ||
| 282 : | mvalenta | 1.4 | <p>Normally, selecting a folder is the same as selecting all of the individual |
| 283 : | files underneath it. (The exception to this is if the folder itself is changed, | ||
| 284 : | such as a conflicting addition). Performing any of the above operations | ||
| 285 : | on a folder should behave as if the files underneath it were selected.</p> | ||
| 286 : | <p>Note that if an action is not specified for a change type, it does not | ||
| 287 : | apply to that change type. This is important in container selection.</p> | ||
| 288 : | <p>For example: Commit does not apply to conflicting changes. If you select | ||
| 289 : | a folder with an Outgoing Change and a Conflicting Change in it, Commit | ||
| 290 : | will apply to the Outgoing Change but not to the Conflicting Change.</p> | ||
| 291 : | kevinm | 1.1 | <h3>Multi-Selection</h3> |
| 292 : | mvalenta | 1.4 | <p>If multiple resources are selected, an action is enabled if it applies |
| 293 : | to any one or more of the selected resources. Choosing that action will | ||
| 294 : | apply the action only to those resources for which it is applicable.</p> | ||
| 295 : | <p>For example: Commit does not apply to conflicting changes. Selecting an | ||
| 296 : | Outgoing Change and a Conflicting Change will result in Commit being enabled. | ||
| 297 : | Choosing Commit will apply to the Outgoing Change but not to the Conflicting | ||
| 298 : | Change.</p> | ||
| 299 : | <p>Multi-Selection and Container Selection may be used in any combination | ||
| 300 : | with predictable results.</p> | ||
| 301 : | kevinm | 1.1 | <h2>Specific Scenaria</h2> |
| 302 : | <h3>Making Manual Changes</h3> | ||
| 303 : | mvalenta | 1.4 | <p>Create a conflicting file change. Manually edit the left source pane in |
| 304 : | the sync view. Hit "Save" on the popup menu. The file should remain a Conflict; | ||
| 305 : | you should get a prompt telling you to Mark as Merged when finished. Choose | ||
| 306 : | Mark as Merged in the popup menu of the tree. The file should change to | ||
| 307 : | an outgoing change. Commit the outgoing change.</p> | ||
| 308 : | kevinm | 1.1 | <h3>Merging Conflicts</h3> |
| 309 : | mvalenta | 1.4 | <p>Try Override and Update with different combinations of Auto-Mergeable |
| 310 : | and Non-Mergeable conflicts in the selection. If all conflicts are Non-Mergeable, | ||
| 311 : | then the only choice is to replace with remote or cancel. If one or more | ||
| 312 : | conflicts are Auto-Mergeable, the choices are (a) Auto-Merge any applicable | ||
| 313 : | files, and replace the rest with remote, (b) Replace all files with remote | ||
| 314 : | or (c) Cancel.</p> | ||
| 315 : | kevinm | 1.1 | <h3>Removing from View</h3> |
| 316 : | mvalenta | 1.4 | <p>Choose Remove from View. Selected nodes should disappear. Refresh the |
| 317 : | view. The nodes should reappear.</p> | ||
| 318 : | kevinm | 1.1 | <h3>Synchronize Outgoing Changes</h3> |
| 319 : | mvalenta | 1.4 | <p>If you choose Synchronize Outgoing Changes from the navigator, the sync |
| 320 : | view should be populated with <b>only the Outgoing Changes and Conflicts</b> | ||
| 321 : | . This operation should be significantly faster in many cases. In this | ||
| 322 : | case, ensure that Refresh does not cause Incoming Changes to appear.</p> | ||
| 323 : | james | 1.2 | <h3>Working with Branches</h3> |
| 324 : | mvalenta | 1.4 | <p>Try any and all of the above, but use a branch instead of HEAD. Behaviour |
| 325 : | should be identical. The sync view decorator should show you the name of | ||
| 326 : | the branch.</p> | ||
| 327 : | james | 1.2 | <h3>Using Mixed Tags</h3> |
| 328 : | mvalenta | 1.4 | <p>Using Team->Branch, Replace With->Branch or Version, and Team->Tag |
| 329 : | as Version, you can create a project which has different tags mixed into | ||
| 330 : | it. For example, one folder may be shared as V2_0, a single file may be attached | ||
| 331 : | to the branch NEW_FEATURE_BRANCH, and the root of the project may be attached | ||
| 332 : | to HEAD. We need to test usage of these projects in the sync view. For example, | ||
| 333 : | if developer 1 has project P shared with HEAD, and folder P/F is shared | ||
| 334 : | with branch B, have developer 2 release a change to folder F in HEAD, and | ||
| 335 : | have developer 1 perform a sync. In this case developer 1 should not see | ||
| 336 : | the incoming change.</p> | ||
| 337 : | kevinm | 1.1 | <h1>Section 3: Migration from 1.0 to 2.0</h1> |
| 338 : | mvalenta | 1.4 | Both the below tests require a workspace created using 1.0 which contains |
| 339 : | projects checked out from a CVS repository.<br> | ||
| 340 : | kevinm | 1.1 | <h3>Migrating a workspace project created using 1.0 to 2.0</h3> |
| 341 : | <ol> | ||
| 342 : | <li>Start Eclipse 2.0 on top of a workspace from 1.0</li> | ||
| 343 : | mvalenta | 1.4 | <li>Select a project that was shared with a CVS repository and chose Team/Share |
| 344 : | Project…</li> | ||
| 345 : | <li>Select the Repository location to share with or enter it if it does | ||
| 346 : | not appear in the list.</li> | ||
| 347 : | <li>Upon finish, the user will be prompted to select either HEAD or the | ||
| 348 : | branch to compare against. </li> | ||
| 349 : | <li>The Synchronize view will then be opened and all files will appear | ||
| 350 : | kevinm | 1.1 | as incoming, outgoing or conflicting additions.</li> |
| 351 : | mvalenta | 1.4 | <li>To see the real conflicts, enable “Compare File Contents” available |
| 352 : | from the drop down menu in the title bar of the Synchronize View.</li> | ||
| 353 : | <li>Resolve the real incoming, outgoing additions and conflicts as | ||
| 354 : | kevinm | 1.1 | appropriate (see sync view test plan for a description of sync state resolution)</li> |
| 355 : | mvalenta | 1.4 | <li>When all conflicts are resolved, disable “Compare File Contents” and |
| 356 : | perform an “Override and Update” on the remaining conflicting additions to | ||
| 357 : | update the sync info of the local resources.</li> | ||
| 358 : | <li>Ensure local copy contains the proper contents (can use Compare With/Latest | ||
| 359 : | from Repository)<br> | ||
| 360 : | kevinm | 1.1 | </li> |
| 361 : | </ol> | ||
| 362 : | <h3>Migrating a project in a CVS Repository from 1.0 to 2.0</h3> | ||
| 363 : | <ol> | ||
| 364 : | <li>Load the project to be migrated from the repository</li> | ||
| 365 : | <li>Perform Team/Set Keyword Substitution…</li> | ||
| 366 : | <ol type="i"> | ||
| 367 : | mvalenta | 1.4 | <li>On page 1, set the keyword substitution mode determination to automatic |
| 368 : | (the default)</li> | ||
| 369 : | kevinm | 1.1 | <li>On page 2, include files that are already shared</li> |
| 370 : | mvalenta | 1.4 | <li>On page 3, ensure that files that are to be changed are actually |
| 371 : | text files, Also, show files that will not be changed and ensure that they | ||
| 372 : | are not text.<br> | ||
| 373 : | kevinm | 1.1 | </li> |
| 374 : | mvalenta | 1.4 | <li>Upon finish, changed files are commited and the keyword substitution |
| 375 : | mode is changed.</li> | ||
| 376 : | kevinm | 1.1 | </ol> |
| 377 : | mvalenta | 1.4 | <li>Checkout a copy of the project and ensure that the file keyword substitution |
| 378 : | modes are correct<br> | ||
| 379 : | kevinm | 1.1 | </li> |
| 380 : | </ol> | ||
| 381 : | mvalenta | 1.4 | <h1>Section 4: Branching and Merging</h1> |
| 382 : | <h2>Main branching scenario</h2> | ||
| 383 : | Here's the main sequence of steps performed over the life cycle of a simple | ||
| 384 : | branch.<br> | ||
| 385 : | <ol> | ||
| 386 : | <li>Load or create a shared project with shared content</li> | ||
| 387 : | <li>Perform a Team/Branch...</li> | ||
| 388 : | <li>Ensure that the tag on the local resources has been updated (either | ||
| 389 : | using the CVS decorators or resource properties)</li> | ||
| 390 : | <li>Make some changes to local resources and commit them (working in a branch | ||
| 391 : | is similar to working in HEAD. See the Synchronize test plan for detaits).</li> | ||
| 392 : | <li>Load HEAD</li> | ||
| 393 : | <li>Optionaly, make some changes to HEAD (may or may not be committed)</li> | ||
| 394 : | <li>Perform a Team/Merge... to merge the branch with HEAD. Merging is similar | ||
| 395 : | to synchronizing but only incoming and conflicting changes are shown. See | ||
| 396 : | the Synchronize test plan for detaits</li> | ||
| 397 : | </ol> | ||
| 398 : | <h2>Variations</h2> | ||
| 399 : | <h3>Comparing branch, root version and HEAD</h3> | ||
| 400 : | After any of the above steps that modify the local content or the remote | ||
| 401 : | content, the success of the operation can ne validated by comparing the local | ||
| 402 : | workspace copy with either HEAD, the branch or the root version specified | ||
| 403 : | when creating the branch. | ||
| 404 : | <h3>Branch with local changes</h3> | ||
| 405 : | Before branching, make some local changes but do not commit them. Changes | ||
| 406 : | can include additions and deletions. After branches ensure that the changes | ||
| 407 : | are still there. On merging ensure that any created or deleted resources | ||
| 408 : | appear properly in the merge editor. | ||
| 409 : | <h3>Don't start working in the branch</h3> | ||
| 410 : | When the branch is created, do not start working in the branch. Ensure | ||
| 411 : | that the workspace was not modified but that the branch and root version | ||
| 412 : | exists remotely (using Comapre With/Branch or Version...) | ||
| 413 : | <h3>Branch on a folder or file</h3> | ||
| 414 : | Branching can also be performed on a folder or file. | ||
| 415 : | <h3>Merge from Head to a branch</h3> | ||
| 416 : | Make some changes to a branch and to HEAD. Merge the changes from HEAD | ||
| 417 : | into the branch before merging the branch with HEAD. | ||
| 418 : | kevinm | 1.1 | </body> |
| 419 : | </html> |
| help@eclipse.org | ViewVC Help |
| Powered by ViewVC 1.0.3 |