diff options
| author | Michael Valenta | 2004-06-01 19:14:48 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-06-01 19:14:48 +0000 |
| commit | 035fc459000db28bec47e8357f44fd1e7072e126 (patch) | |
| tree | f647d2dfbb79929fc64b9f296a3ca9e7e23514cc | |
| parent | e69cab9abc965080ca2a2d2fa3bdac4b842159aa (diff) | |
| download | eclipse.platform.team-035fc459000db28bec47e8357f44fd1e7072e126.tar.gz eclipse.platform.team-035fc459000db28bec47e8357f44fd1e7072e126.tar.xz eclipse.platform.team-035fc459000db28bec47e8357f44fd1e7072e126.zip | |
Updated test scenarios
13 files changed, 366 insertions, 66 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00007.html b/tests/org.eclipse.team.tests.cvs.core/html/00007.html index 86f1bb93b..d94d54ab0 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00007.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00007.html @@ -5,7 +5,9 @@ </head><body><h2>Check Out - prompts</h2> <p>Since: 3.0 M5<br> Last Modified: $Date: 2004/02/25 20:34:42 $</p> -<ul> + +<h3>Scenario 1</h3> +<ol> <li>Select a project in HEAD</li> <li>Perform a Checkout</li> <li>Ensure project was checked out properly</li> @@ -13,5 +15,43 @@ Last Modified: $Date: 2004/02/25 20:34:42 $</p> <li>Use the same name and specify a custom location</li> <li>Ensure that the user is prompted to overwrite</li> <li>Ensure OK and Cancel have proper behavior</li> -</ul> +</ol> + +<h3>Scenario 2</h3> +<ol> + <li>Select a project in HEAD</li> + <li>Perform a Checkout</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout of the same project again</li> + <li>Ensure that the user is prompted to overwrite</li> + <li>Ensure OK and Cancel have proper behavior</li> +</ol> + +<h3>Scenario 3</h3> +<ol> + <li>Select a project in HEAD</li> + <li>Perform a Checkout As</li> + <li>Use the same name and specify a custom location</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout As of the same project to the same location as in step 3</li> + <li>Ensure that the user is prompted to overwrite</li> + <li>Ensure OK and Cancel have proper behavior</li> +</ol> + +<h3>Scenario 4</h3> +<ol> + <li>Select a project in HEAD</li> + <li>Perform a Checkout As</li> + <li>Use the same name and specify a custom location</li> + <li>Ensure project was checked out properly</li> + <li>Delete the project but leave the contents on disk</li> + <li>Perform a Checkout on the project</li> + <li>Ensure project was checked out properly</li> + <li>Perform a Checkout As of the same project to the same location as in step 3</li> + <li>Ensure that the user is prompted twice: once to overwrite project and once to overwrite custom location</li> + <li>Ensure OK and Cancel have proper behavior</li> +</ol> + </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00011.html b/tests/org.eclipse.team.tests.cvs.core/html/00011.html index 57541eb8b..c097f928a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00011.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00011.html @@ -1,10 +1,20 @@ -<html><head><title>Sync View operations and selection</title> +<html><head><title>Synchronize View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Sync View operations and selection</h2> +</head><body><h2>Synchronize View</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> + +<h3>Synchronize View Modes</h3> + +Ensure that choosing modes +<ul> +<li>result in proper filtering +<li>updates status bar properly +</ul> + +<h3>Synchronize View Operations</h3> <p>Ensure Commit and Update buttons:</p> <ul> <li>operate on all applicable visible changes</li> @@ -40,5 +50,145 @@ Last Modified: $Date: 2004/02/25 20:34:42 $</p> </ul> <p>All actions on large sets (Mark as Merged as well)</p> +The following table can be used to determine what operations are appropriate and what result to expect. + +<table height="124" border="1" width="99%"> + <tbody> + <tr> + <td width="25%"><b>Change Type</b></td> + <td width="25%"><b>Action</b></td> + <td width="50%"><b>Result</b></td> + </tr> + <tr> + <td width="25%"><b>Incoming File Change</b></td> + <td width="25%">Update</td> + <td width="50%">Remote contents become local. Try with both Text and + Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Change</b></td> + <td width="25%">Override and Commit</td> + <td width="50%">Only in Both mode. Prompt for release comment. Cancel + aborts, OK commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Addition</b></td> + <td width="25%">Update</td> + <td width="50%">Remote contents become local. Try with both Text and + Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Addition</b></td> + <td width="25%">Override and Commit</td> + <td width="50%">Only in Both mode. Prompt for release comment. Cancel + aborts, OK commits deletion to server.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Deletion</b></td> + <td width="25%">Update</td> + <td width="50%">Local file is deleted.</td> + </tr> + <tr> + <td width="25%"><b>Incoming File Deletion</b></td> + <td width="25%">Override and Commit</td> + <td width="50%">Only in Both mode. Prompt for release comment. Cancel + aborts, OK commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Change</b></td> + <td width="25%">Commit</td> + <td width="50%">Prompt for release comment. Cancel aborts, OK commits + local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Change</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Only in Both mode. Remote contents become local. Try + with both Text and Binary files.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Add to Version Control</td> + <td width="50%">Adds the file to version control. The icon should change + in the sync view, and Commit should now be enabled.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Add to .cvsignore</td> + <td width="50%">Adds the file to .cvsignore. The file should disappear + from the sync view. The .cvsignore file should appear (if it wasn't visible + already). The file should not appear in subsequent syncs.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Commit</td> + <td width="50%">Commit is only enabled on an outgoing addition if it + has first been added to version control. Prompt for release comment. Cancel + aborts, OK commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Addition</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Only in Both mode. Local file is deleted.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Deletion</b></td> + <td width="25%">Commit</td> + <td width="50%">Prompt for release comment. Cancel aborts, OK commits + deletion to server.</td> + </tr> + <tr> + <td width="25%"><b>Outgoing File Deletion</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Only in Both mode. File is re-created, remote contents + become local.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Change</b></td> + <td width="25%">Override and Commit</td> + <td width="50%">Prompt for release comment. Cancel aborts, OK commits + local file to server. Applies to both auto-mergeable and non-mergeable conflicts.</td> + </tr> + <tr> + <td width="25%"><b>Auto-mergeable Conflicting File Change</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Auto-mergeable conflicts have a two-way red/green arrow. + Dialog prompts user to either auto-merge or replace. If user chooses auto-merge, + then remote changes are merged in with local changes. File should still +be dirty, local changes should still be present, CVS markup should not be +present, and no .# files should have been created. If user chooses replace, +then local changes are discarded and remote contents replace local. No .# +files created, no CVS markup, and the file is not dirty as a result. If +the user chooses cancel nothing happens.</td> + </tr> + <tr> + <td width="25%"><b>Non-mergeable Conflicting File Change</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Dialog prompts user to replace local changes. If user + cancels nothing happens. If user chooses OK, then local changes are discarded + and remote contents replace local. No .# files created, no CVS markup, and + the file is not dirty as a result.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Addition</b></td> + <td width="25%">Add to Version Control</td> + <td width="50%">Adds the file to version control. The icon should change + in the sync view, and Override and Commit should now be enabled.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Addition</b></td> + <td width="25%">Override and Commit</td> + <td width="50%">Override and Commit is only enabled on an outgoing addition +if it has first been added to version control. Prompt to warn of conflicting +changes. If OK, prompt for release comment. Cancel aborts either dialog. +OK commits local file to server.</td> + </tr> + <tr> + <td width="25%"><b>Conflicting File Addition</b></td> + <td width="25%">Override and Update</td> + <td width="50%">Remote contents become local.</td> + </tr> + </tbody> +</table> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00013.html b/tests/org.eclipse.team.tests.cvs.core/html/00013.html index b30163a98..d0b1bcc43 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00013.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00013.html @@ -1,12 +1,12 @@ -<html><head><title>Sync View operations and selection</title> +<html><head><title>Synchronize View</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Sync View operations and selection</h2> +</head><body><h2>Synchronize View</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/02/25 20:34:42 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <ul> -<li>Same scenarios as <a href="html/00011.html">Sync View operations and selection</a> except you can't commit. -<li>Test mark as merged (ensure that it can work on large data sets +<li>Same scenarios as <a href="00011.html">CVS Synchronize View</a> except you can't commit. +<li>Test mark as merged (ensure that it can work on large data sets) </ul> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00022.html b/tests/org.eclipse.team.tests.cvs.core/html/00022.html index ea52f0f96..c60fcf158 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00022.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00022.html @@ -4,33 +4,26 @@ <meta NAME="since" content=""> </head><body><h2>Performing a Merge</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/25 16:39:41 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -<h3>Scenario 1: Merge in Dialog</h3> -<ol> -<li>Select a project and perform a Team>Merge. -<li>Choose the start and end tags in the wizard and finish. -<li>The merge will run in the background. -<li>Upon completion, the user is presented with a dialog of the incoming changes. -<li>Update the incoming changes and ensure they worked. -</ol> -<p>After updating, reperform the same merge. A no-changes dialog should be -presented since the local contents match the end-poimt. +<h3>Scenario 1: One Time Merge</h3> -<h3>Scenario 1: Merge in Synchronize view</h3> +<p> +Using Team>Merge, merge the changes from a branch into HEAD. Once completed, in the synchronize view, +update the incoming changes, resolve any conflicts and ensure they worked, After updating, +redo the same merge. A no-changes dialog should be +presented since the local contents match the end-point. -<ol> -<li>Perform the previous scenario except for the last step -<li>Choose to remember the merge -<li>Ensure that the merge appears in the Synchronize View -<li>Exit and restart eclipse -<li>The merge should still exist in the Synchronize View -<li>Update to the incoming changes. -<li>Optionally release new changes to the merge endpoint and refresh the merge. -The new updates should appear. -<li>Delete the merge from the synchronize view using the remove toolbar button -<li>The merge subscriber should be removed from the view. -</ol> +<h3>Scenario 2: Ongoing Merge</h3> + +After performing a one-time merge, pin the entry in the synchronize view. +Release changes to the end point (branch) and synchronize the merge. +The new changes should appear in the synchronize view. Update to these +changes as appropriate. + +<h3>Removing a Merge</h3> + +<p>Delete the merge from the synchronize view using the remove toolbar button. The merge subscriber should be removed from the view. </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00040.html b/tests/org.eclipse.team.tests.cvs.core/html/00040.html index 8bf5cf9df..7b64daa37 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00040.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00040.html @@ -4,8 +4,8 @@ <meta NAME="since" content=""> </head><body><h2>Reverting deleted resources</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/09 20:51:17 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -You should be able to restore a deleted revision from the CVS server. +You should be able to restore a deleted revision from the CVS server Team>Restore from Repository </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00048.html b/tests/org.eclipse.team.tests.cvs.core/html/00048.html index 2655f997a..8da96bb5a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00048.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00048.html @@ -4,8 +4,7 @@ <meta NAME="since" content=""> </head><body><h2>Performing a Synchronize</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/25 16:39:41 $</p> - +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <p> Synchronizing means to compare your local workspace contents with the contents diff --git a/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html b/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html index 88c77ef4f..53617adae 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/checkoutwizard00001.html @@ -5,8 +5,31 @@ </head><body> <h2>Checkout Wizard</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 20:01:23 $</p><body> -<p>The checkout wizard should be available from the following parts of the workbench: import, new project, empty workspace CVS synchronize action, toolbar in CVS perspective.</p> -<h3>Sniff</h3> -<p>You should be able to create a new repo location and checkout a project entirely from the wizard.</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p><body> + +<p>The checkout wizard should be available from the following parts of the workbench: +import, new project, empty workspace CVS synchronize action, toolbar in CVS perspective. +The checkout wiard is also available from the context menu of the repositories view +as the Checkout As menu item.</p> + +<p>The following variants should be tested: +<ul> +<li>Create a new repository location and checkout a project entirely from the wizard. +<li>Check out a tag +<li>Check out a project that does not contain a .project file. This should result in +a second wizard that allows projct configuration (e.g. Java project). +</ul> + +<h3>Repositories View Checkout Variants</h3> +These test require an existing repository which contains projects, at least one of which +does not contain a .project file. +<ol> + <li>Perform "Check Out" on a single project. Ensure that repeating results in overwrite prompt.</li> + <li>Perform "Check Out" on multiple projects.</li> + <li>Perform "Check Out As..." on a single project (that contains a .project file) and enter custom name and/or custom location.</li> + <li>Perform "Check Out As..." on a single remote project that does not have a .project file and + ensure that the user is prompted for the project type to create.</li> + <li>Perform "Check Out As..." on multipe projects and enter a custom parent location.</li> + <li>Perform "Check Out As..." and specify a tag.</li> +</ol> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html b/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html index 0aaccfb20..9ea562f29 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/commit_stes00001.html @@ -3,8 +3,8 @@ <meta NAME="keywords" content=""> <meta NAME="since" content=""> </head><body><h2>Commit Sets Layout</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p> +<p>Since: 3.0 M9<br> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html b/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html index 0ae84501a..9fc1bd662 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/datetags_repoview00001.html @@ -1,11 +1,43 @@ -<html><head><title>Date Tags</title> +<html><head><title>Tags</title> <LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> <meta NAME="keywords" content=""> <meta NAME="since" content=""> -</head><body><h2>Date Tags</h2> -<p>Since: <br> -Last Modified: $Date: 2004/05/31 20:01:23 $</p><body> +</head><body><h2>Tags</h2> +<p>Since: 3.0<br> +Last Modified: $Date: 2004/06/01 15:23:56 $</p><body> + +<h3>Refresh Branches and Versions</h3> +<ol> + <li>Select a repository location and perform "Refresh Branches and Versions...". + <li>Select one or more projects that contain a .project file and have been tagged with branch and version tags and click finish.</li> + <li>Expand the respository entry to view ... + <ul> + <li>projects in HEAD,</li> + <li>branches and projects in BRANCHES,</li> + <li>projects and versions in VERSIONS.</li> + </ul> +</ol> + +<h3>Configure Branches and Versions</h3> +<ol> + <li>Select a project in the repositories view and perform "Configure Branches and Versions...". + <li>Select some branch and version tags to be remembered.</li> + <li>Expand the respository entry to view ... + <ul> + <li>projects in HEAD,</li> + <li>branches and projects in BRANCHES,</li> + <li>projects and versions in VERSIONS.</li> + </ul> +</ol> <h3>Date Tags</h3> +The ability to create Date tags should be available from the following locations: + +<ul> +<li>Repositories view</li> +<li>Configure Branches and Versions dialog +<li>Tag selection dialogs (Compare with and Replace with Branch or Version) +</ul> + </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html b/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html index d1a3f9681..e97e5f48c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/repoview_basics00001.html @@ -4,17 +4,39 @@ <meta NAME="since" content=""> </head><body><h2>Basics</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> -<p>You should be able to create a repo connection from the toolbar of the view or via the context menu. Try expanding, searching for branches. Also, -try the failures cases from <a href="html/connections00001.html">Connections</a>. +<h3>Adding and Discarding Locations</h3> + +<p>You should be able to create a repository location from the toolbar of the view or via the context menu. +Try expanding the location, the HEAD, Versions and Branches categories. Also, +try the failures cases from <a href="connections00001.html">Connections</a>. Things to try: <ul> <li>Create repo locations for different connection types: ext, pserver, extssh. -<li>Expanding project nodes should process the children in the background and the view should remain responsive while this is happening. When children nodes are added to the +<li>Expanding project nodes should process the children in the background and the +view should remain responsive while this is happening. When children nodes are added to the tree the tree shouldn't be too jumpy. +<li>Discard a location and ensure it is removed. Also ensure that discarding is not permitted when +projects in the local workspace are shared with the location. </ul> </p> +<h3>Repository Location Properties</h3> + +View a location's properties page and ensure that information is correct and can be changed. +Ensure that the sharing information for any projects mapped to the location are also changed. + +<h3>Modules</h3> + +<h3>Working with modules</h3> + +<ul> + <li>Expanding HEAD or the Versions category should display the modules defined in the CVSROOT/modules file</li> + <li>Check Out and Checkout As should be availabel on modules and should work as expected</li> + <li>Performing a "Configure Branches and Versions" on the module allows the user to set the autorefresh file and add some tags. + Ensure that the module now appears properly in association with those tags.</li> +</ol> + </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html b/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html index 2f2db8905..1f79ae54d 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/sharingbasics00001.html @@ -4,13 +4,14 @@ <meta NAME="since" content=""> </head><body><h2>Basics</h2> <p>Since: <br> -Last Modified: $Date: 2004/05/31 14:22:48 $</p> +Last Modified: $Date: 2004/06/01 15:23:56 $</p> <p>Single select a project and select share.</p> <ul> <li>Should only be available if the project is not shared. <li>Menu item should be available from the Project top level menu. <li>Wizard should allow you to cancel at any time and un-map the project. Note that some resources may of been committed via the wizard that will remain committed. +<li>Should be able to share as a repository root {".") or a folder at any level (i.e. a folder name with one or more paths). </ul> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html b/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html new file mode 100644 index 000000000..0dda534fa --- /dev/null +++ b/tests/org.eclipse.team.tests.cvs.core/html/sync00001.html @@ -0,0 +1,40 @@ +<html><head><title>Scenarios</title> +<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> +<meta NAME="keywords" content=""> +<meta NAME="since" content=""> +</head><body><h2>Scenarios</h2> +<p>Since: <br> +Last Modified: $Date: 2004/06/01 15:24:23 $</p> + +<h3>Making Manual Changes</h3> +<p>Create a conflicting file change. Manually edit the left source pane in + the sync view. Hit "Save" on the popup menu. The file should remain a Conflict. Choose + Mark as Merged in the popup menu of the tree. The file should change to +an outgoing change. Commit the outgoing change.</p> +<h3>Merging Conflicts</h3> +<p>Try Override and Update with different combinations of Auto-Mergeable +and Non-Mergeable conflicts in the selection. If all conflicts are Non-Mergeable, + then the only choice is to replace with remote or cancel. If one or more +conflicts are Auto-Mergeable, the choices are (a) Auto-Merge any applicable +files, and replace the rest with remote, (b) Replace all files with remote +or (c) Cancel.</p> +<h3>Removing from View</h3> +<p>Choose Remove from View. Selected nodes should disappear. Refresh the +view. The nodes should reappear.</p> + +<h3>Working with Branches</h3> +<p>Try any and all of the above, but use a branch instead of HEAD. Behaviour + should be identical. The sync view decorator should show you the name of +the branch.</p> +<h3>Using Mixed Tags</h3> +<p>Using Team->Branch, Replace With->Branch or Version, and Team->Tag + as Version, you can create a project which has different tags mixed into +it. For example, one folder may be shared as V2_0, a single file may be attached + to the branch NEW_FEATURE_BRANCH, and the root of the project may be attached + to HEAD. We need to test usage of these projects in the sync view. For example, + if developer 1 has project P shared with HEAD, and folder P/F is shared +with branch B, have developer 2 release a change to folder F in HEAD, and +have developer 1 perform a sync. In this case developer 1 should not see +the incoming change.</p> + +</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/toc.xml b/tests/org.eclipse.team.tests.cvs.core/toc.xml index efd45e554..cf920b4b5 100644 --- a/tests/org.eclipse.team.tests.cvs.core/toc.xml +++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml @@ -8,7 +8,7 @@ </topic> <topic label="Check Out Wizard" href="html/checkoutwizard00001.html"> </topic> - <topic label="Date Tags" href="html/datetags_repoview00001.html"> + <topic label="Tags" href="html/datetags_repoview00001.html"> </topic> </topic> <topic label="Sharing" href="html/00026.html"> @@ -46,22 +46,22 @@ </topic> </topic> <topic label="Synchronizing" href="html/00010.html"> - <topic label="Sync View operations and selection" href="html/00011.html"> - </topic> - <topic label="Sync View modes and working sets" href="html/00016.html"> - </topic> <topic label="Performing a Synchronize" href="html/00048.html"> </topic> + <topic label="Synchronize View" href="html/00011.html"> + </topic> <topic label="Decorations" href="html/00049.html"> </topic> <topic label="Commit Sets Layout" href="html/commit_stes00001.html"> </topic> + <topic label="Scenarios" href="html/sync00001.html"> + </topic> </topic> <topic label="Merging" href="html/00012.html"> - <topic label="Sync View operations and selection" href="html/00013.html"> - </topic> <topic label="Performing a Merge" href="html/00022.html"> </topic> + <topic label="Synchronize View" href="html/00013.html"> + </topic> </topic> <topic label="Patching" href="html/00029.html"> <topic label="Importing a zip over a shared project" href="html/00030.html"> @@ -114,12 +114,12 @@ <topic label="Performance" href="html/perf00001.html"> <topic label="Timings" href="html/perf00002.html"> </topic> - <topic label="Resource Data Structures" href="html/perf00004.html"> - </topic> - <topic label="Looking For Leaks" href="html/perf00005.html"> - </topic> - <topic label="Team Data Structures" href="html/perf00006.html"> - </topic> + <topic label="Resource Data Structures" href="html/perf00004.html"> + </topic> + <topic label="Looking For Leaks" href="html/perf00005.html"> + </topic> + <topic label="Team Data Structures" href="html/perf00006.html"> + </topic> </topic> <topic label="Failure Cases" href="html/failures00001.html"> <topic label="Connections" href="html/connections00001.html"> |