diff options
| author | Michael Valenta | 2003-12-15 19:19:45 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-12-15 19:19:45 +0000 |
| commit | e0227e5762a08e40caa5fb1e909b7b777e3e702e (patch) | |
| tree | 20c0873b1cf2d9bd9dbf373436c6200cd3e63ca5 /tests/org.eclipse.team.tests.cvs.core | |
| parent | 19f6c1ec6e840de63cb8db339735e814c96fc991 (diff) | |
| download | eclipse.platform.team-e0227e5762a08e40caa5fb1e909b7b777e3e702e.tar.gz eclipse.platform.team-e0227e5762a08e40caa5fb1e909b7b777e3e702e.tar.xz eclipse.platform.team-e0227e5762a08e40caa5fb1e909b7b777e3e702e.zip | |
*** empty log message ***
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core')
| -rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/html/00029.html | 11 | ||||
| -rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/html/00030.html | 29 | ||||
| -rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/toc.xml | 4 |
3 files changed, 44 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00029.html b/tests/org.eclipse.team.tests.cvs.core/html/00029.html new file mode 100644 index 000000000..f52a7d5b3 --- /dev/null +++ b/tests/org.eclipse.team.tests.cvs.core/html/00029.html @@ -0,0 +1,11 @@ +<html><head><title>Patching</title> +<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> +<meta NAME="keywords" content=""> +<meta NAME="since" content=""> +</head><h2>Patching</h2> +<p>Since: <br> +Last Modified: $Date: 2003/11/27 22:04:58 $</p><body> + +Answer comes here. + +</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00030.html b/tests/org.eclipse.team.tests.cvs.core/html/00030.html new file mode 100644 index 000000000..dc74f46dc --- /dev/null +++ b/tests/org.eclipse.team.tests.cvs.core/html/00030.html @@ -0,0 +1,29 @@ +<html><head><title>Importing a zip over a shared project</title> +<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css> +<meta NAME="keywords" content=""> +<meta NAME="since" content=""> +</head><h2>Importing a zip over a shared project</h2> +<p>Since: <br> +Last Modified: $Date: 2003/11/27 22:04:58 $</p><body> + +<p>This scenario captures one means of patching. It assumes that a zip file contains +a previous version of a project that has been modified in some way and added to +a zip archive (without CVS directories).</p> + +<p>Perform the following steps:</p> +<ol> + <li>Load the project from CVS (using Checkout or some other means)</li> + <li>Import the zip over the loaded project.</li> + <li>Ensure that the sync states are Outgoing for all resources from the zip file.</li> + <li>Ensure that all folders from the zip file (except new ones) + are marked as in-sync and all files (except new ones) are outgoing changes. + <li>Changing the comparison criteria to compare contents should not contact the server + and should leave only the resources that differ in the sync view. Perform a + Mark As Merged and a Commit on these resources.</li> + <li>Changing the comparison criteria back to revision number will reveal all the files + whose content did not change, perform a Mark as merged on these resources followed by + a Team>Update on the project in the Navigator (Note: This could be handled better).</li> + <li>After the update, ensure the project has no out-of-sync resources.</li> +</ol> + +</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 2114fbf59..894f05903 100644 --- a/tests/org.eclipse.team.tests.cvs.core/toc.xml +++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml @@ -46,5 +46,9 @@ <topic label="Reconnecting to existing" href="html/00028.html"> </topic> </topic> + <topic label="Patching" href="html/00029.html"> + <topic label="Importing a zip over a shared project" href="html/00030.html"> + </topic> + </topic> </topic> </toc> |