Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-03-09 20:51:17 +0000
committerJean Michel-Lemieux2004-03-09 20:51:17 +0000
commit70d8db4a04629905c0aefa376adfc27566b12c73 (patch)
tree99abba1031918f6e868a7a1ad3e7faed7abce295 /tests/org.eclipse.team.tests.cvs.core/html
parentb1c14fbe58367c34bf6eef789f77edca3623f574 (diff)
downloadeclipse.platform.team-70d8db4a04629905c0aefa376adfc27566b12c73.tar.gz
eclipse.platform.team-70d8db4a04629905c0aefa376adfc27566b12c73.tar.xz
eclipse.platform.team-70d8db4a04629905c0aefa376adfc27566b12c73.zip
Added several things:
- a global action to refresh - a compare dialog framework that will allow you to show compare input in a dialog and support saving
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/html')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00008.html2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00039.html31
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00040.html6
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00041.html16
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00042.html11
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00043.html14
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00044.html11
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00045.html11
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00046.html11
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00047.html20
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00048.html50
11 files changed, 169 insertions, 14 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00008.html b/tests/org.eclipse.team.tests.cvs.core/html/00008.html
index da57e72b0..6a7d80430 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00008.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00008.html
@@ -4,6 +4,6 @@
<meta NAME="since" content="">
</head><body><h2>Comparing</h2>
-Answer comes here.
+The CVS plugin supports comparing of resources in the workspace with revision in the repository. You can also compare between two remote elements.
</body></html> \ No newline at end of file
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 b9035d03f..455428b7a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00039.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00039.html
@@ -1,10 +1,10 @@
-<html><head><title>Local resources with a repository</title>
+<html><head><title>Compare with another branch or version</title>
<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
<meta NAME="keywords" content="">
<meta NAME="since" content="">
-</head><h2>Local resources with a repository</h2>
+</head><h2>Compare with another branch or version</h2>
<p>Since: M8<br>
-Last Modified: $Date: 2003/11/27 22:04:58 $</p><body>
+Last Modified: $Date: 2004/03/05 17:12:22 $</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
@@ -13,16 +13,27 @@ merge changes into the local workspace.</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>
-<h3>Comparing with another branch or version</h3>
+<h3>On file selected</h3>
<ul>
-<li>
-</ul>
-<h3>Multi-select files</h3>
-<ul>
-<li>
+<li>If the file has differences open a compare editor and show otherwise a message is shown to indicate that the file is the same.
+<li>should be able to open the history view and link in to the opened compare editor
+<li>the compare editor should update when changes are made to the local file in some other context (e.g other editor, refactoring).
</ul>
+
+<h3>Multiple selection</h3>
+<p>Entire contents of the folder are compared deep. If changes are found the user is notified and they are
+shown in a dialog. If no changes are found the user is notified. The dialog should allow the user to browse
+the changes and merge anything into his workspace. If the user wants to keep the comparison non-model, he
+can add it to the synchronize view. There is a button to do so on the compare dialog.</p>
+
<h3>Merging changes</h3>
+<p>
+When the compare dialog is showing several changes you should be able to selectively merge anything into the local workspace. Specific attention should
+be made to the following cases:
+</p>
<ul>
-<li>
+<li>Edit the local then press ok. You should be prompted to save the changes and the changes should be correctly updated in the corresponding resource.
+<li>Edit the local and browse to another file. You should be prompted to save the changes.
+<li>Press the cancel button with changes, you should be prompted.
</ul>
</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 64163316f..88a49f905 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00040.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00040.html
@@ -3,9 +3,9 @@
<meta NAME="keywords" content="">
<meta NAME="since" content="">
</head><h2>Reverting deleted resources</h2>
-<p>Since: <br>
-Last Modified: $Date: 2003/11/27 22:04:58 $</p><body>
+<p>Since: M8<br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
-Answer comes here.
+You should be able to restore a deleted revision from the CVS server.
</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00041.html b/tests/org.eclipse.team.tests.cvs.core/html/00041.html
new file mode 100644
index 000000000..1b01a511a
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00041.html
@@ -0,0 +1,16 @@
+<html><head><title>File Revisions</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>File Revisions</h2>
+<p>Since: M8<br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</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>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
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00042.html b/tests/org.eclipse.team.tests.cvs.core/html/00042.html
new file mode 100644
index 000000000..c975656b4
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00042.html
@@ -0,0 +1,11 @@
+<html><head><title>CVS Console</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>CVS Console</h2>
+<p>Since: <br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+Answer comes here.
+
+</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00043.html b/tests/org.eclipse.team.tests.cvs.core/html/00043.html
new file mode 100644
index 000000000..e618f1876
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00043.html
@@ -0,0 +1,14 @@
+<html><head><title>Preferences</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>Preferences</h2>
+<p>Since: M8<br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+There are a couple of preferences that controls the behavior and presentation of the console. These are:
+<ul>
+<li>font color: message color, error color, command line. Changing these should immediatly update the console view.
+</ul>
+
+</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00044.html b/tests/org.eclipse.team.tests.cvs.core/html/00044.html
new file mode 100644
index 000000000..b5362520f
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00044.html
@@ -0,0 +1,11 @@
+<html><head><title>Replacing</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>Replacing</h2>
+<p>Since: <br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+Answer comes here.
+
+</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00045.html b/tests/org.eclipse.team.tests.cvs.core/html/00045.html
new file mode 100644
index 000000000..33122972c
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00045.html
@@ -0,0 +1,11 @@
+<html><head><title>With latest</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>With latest</h2>
+<p>Since: <br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+Answer comes here.
+
+</body></html> \ No newline at end of file
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00046.html b/tests/org.eclipse.team.tests.cvs.core/html/00046.html
new file mode 100644
index 000000000..951e23110
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00046.html
@@ -0,0 +1,11 @@
+<html><head><title>With another branch of version</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>With another branch of version</h2>
+<p>Since: <br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+Answer comes here.
+
+</body></html> \ 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
new file mode 100644
index 000000000..7fbd26bf0
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00047.html
@@ -0,0 +1,20 @@
+<html><head><title>With file revision</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>With file revision</h2>
+<p>Since: <br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</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>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...)
+
+</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
new file mode 100644
index 000000000..516f56fd2
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00048.html
@@ -0,0 +1,50 @@
+<html><head><title>Refreshing with Remote</title>
+<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
+<meta NAME="keywords" content="">
+<meta NAME="since" content="">
+</head><h2>Refreshing with Remote</h2>
+<p>Since: M8<br>
+Last Modified: $Date: 2004/03/05 17:12:22 $</p><body>
+
+
+<p>
+Synchronizing means ???
+</p>
+
+<h3>After a Synchronize has completed</h3>
+<p>Generally the sync view is shown AFTER the synchronize operation has completed. This way we don't interrupt the user's context. Why do
+people like to be prompted after? For some the synchronize operation can be very long, and they want to be told when they can view the
+results.</p>
+ <ul>
+ <li>1st time and no changes, then simply prompt that there are no changes.
+ <li>1st time and there are changes in the workspace, then prompt asking about perspective switch next enumerate the types of changes in the workspace, and open sync view.
+ <li>other times and no changes, then simply prompt.
+ <li>other times and changes, then prompt enumerating the types of changes in the workspace, and open sync view.
+ <li>other times and changes and option to not prompt, open sync view.
+ </ul>
+
+<p>
+There are a couple of reasons someone may want to synchronize with the remote. There are currently
+two ways of running the refresh operation:
+<ul>
+<li>Directly from the synchronize view
+<li>From Team > Synchronize with Repository
+</ul>
+</p>
+<h3>Notice a file is out-of-sync in another view (e.g. packages explorer, types) and want to see the changes</h3>
+<p>In case you can select a file, it will be refreshed with the server, and if changes are found the compare editor is opened
+that will allow browsing the changes. If no changes are found, you will be prompted.</p>
+
+<h3>From another view would like to browse the outgoing/incoming changes for several resources</h3>
+<p>Select a folder or group of files and Team > Synchronize will open the sync view and automatically refresh with
+the remote repository.</p>
+
+<h3>In the sync view and would like to refresh to see if there are new changes from the server</h3>
+<p>
+
+</p>
+
+Assumption, the sync view may or may not be open when the synchronize is performed. Maybe we need a different prompt
+each case. One for Team > Sync and another for refresh from the sync view.
+
+</body></html> \ No newline at end of file

Back to the top