diff options
4 files changed, 13 insertions, 9 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00009.html b/tests/org.eclipse.team.tests.cvs.core/html/00009.html index 2615c2c18..5ca069330 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00009.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00009.html @@ -4,7 +4,7 @@ <meta NAME="since" content=""> </head><body><h2>Remote resources</h2> <p>Since: 3.0 M5<br> -Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> +Last Modified: $Date: 2004/02/25 20:34:42 $</p><body> <h4>Compare With... in Repositories view </h4> <p>Perform the following steps:</p> <ol> @@ -14,6 +14,7 @@ Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> <li>Repeat and in step 2) use a version tag</li> </ol> <p>Repeat the above steps for a project in a branch and a project version.</p> +<p>Repeat the above steps for a selected folder and a selected file.</p> <h4>Compare on two selections in Repositories view</h4> <p>Perform the following steps:</p> <ol> @@ -24,6 +25,7 @@ Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> </ol> <p>Repeat the above for various conbinations (branch + version, version + branch, branch + branch, version + version).</p> + <p>Repeat the above steps for a selected folder and a selected file.</p> <h4>Compare on two selections in Resource History view.</h4> <p>Perform the following steps:</p> <ul> diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00039.html b/tests/org.eclipse.team.tests.cvs.core/html/00039.html index 455428b7a..bd819408a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00039.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00039.html @@ -4,12 +4,13 @@ <meta NAME="since" content=""> </head><h2>Compare with another branch or version</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/05 17:12:22 $</p><body> +Last Modified: $Date: 2004/03/09 20:51:17 $</p><body> <p> You should be able to select a project/folder/resource and compare againts another branch or version. Multi-select should work across projects in different repositories. Once the comparison is shown it should be possible to -merge changes into the local workspace.</p> +merge changes into the local workspace. It should also be possible to remember +the comparison, which will cause it to appear in the synchronize view.</p> <p> We should support multi-selection of files, but I'm not sure what should be shown to the user in those cases.</p> diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00041.html b/tests/org.eclipse.team.tests.cvs.core/html/00041.html index 1b01a511a..f04a15bfc 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00041.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00041.html @@ -4,13 +4,14 @@ <meta NAME="since" content=""> </head><h2>File Revisions</h2> <p>Since: M8<br> -Last Modified: $Date: 2004/03/05 17:12:22 $</p><body> +Last Modified: $Date: 2004/03/09 20:51:17 $</p><body> <h3>Compare the local resource with other revisions</h3> <ul> <li>If the file isn't managed the action should no appear. <li>If the file doesn't have any revisions you should be prompted <li>If the file has revisions you should be prompted with the list of revisions in a compare dialog -<li>In the compare dialog you can select any revision and mreges changes into the local copy +<li>In the compare dialog you can select any revision and merge changes into the local copy <li>If you edit the local resource then chose OK, you will be prompted to save changes. Ensure that the changes are saved correctly to the underlying resource. -<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...)
\ No newline at end of file +<li>Ensure that the titles are ok (e.g. dialog title, structure pane title...) +</ul>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00047.html b/tests/org.eclipse.team.tests.cvs.core/html/00047.html index 7fbd26bf0..eb21ad433 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00047.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00047.html @@ -4,17 +4,17 @@ <meta NAME="since" content=""> </head><h2>With file revision</h2> <p>Since: <br> -Last Modified: $Date: 2004/03/05 17:12:22 $</p><body> +Last Modified: $Date: 2004/03/09 20:51:17 $</p><body> <h3>Replace the local resource with other revisions</h3> <ul> <li>If the file isn't managed the action should no appear. <li>If the file doesn't have any revisions you should be prompted <li>If the file has revisions you should be prompted with the list of revisions in a compare dialog -<li>In the compare dialog you can select any revision and mreges changes into the local copy -<li>If you edit the local resource then chose OK, you will be prompted to save changes. Ensure that the changes are saved correctly to the underlying resource. +<li>In the compare dialog you can select any revision and compare changes but merging isn't supported <li>If a revision is selected the Replace button should be enabled. Otherwise it should be disabled <li>If you selected the replace button the file should contain the contents of the revision selected. The dialog will also close. <li>Ensure that the titles are ok (e.g. dialog title, structure pane title...) +</ul> </body></html>
\ No newline at end of file |