diff options
author | Michael Valenta | 2004-03-18 21:04:58 +0000 |
---|---|---|
committer | Michael Valenta | 2004-03-18 21:04:58 +0000 |
commit | c716e16e7760f5da4edb928dcf4b737e585af0a9 (patch) | |
tree | 66b7645e3118b48f0a92f878d9448f855f1e72f0 /tests/org.eclipse.team.tests.cvs.core | |
parent | 22bc37d93552c99541db02fc3113827a0abb6271 (diff) | |
download | eclipse.platform.team-c716e16e7760f5da4edb928dcf4b737e585af0a9.tar.gz eclipse.platform.team-c716e16e7760f5da4edb928dcf4b737e585af0a9.tar.xz eclipse.platform.team-c716e16e7760f5da4edb928dcf4b737e585af0a9.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/00028.html | 47 | ||||
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/html/00050.html | 35 | ||||
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/toc.xml | 4 |
3 files changed, 69 insertions, 17 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00028.html b/tests/org.eclipse.team.tests.cvs.core/html/00028.html index f8dfc2d88..2575c41bc 100644 --- a/tests/org.eclipse.team.tests.cvs.core/html/00028.html +++ b/tests/org.eclipse.team.tests.cvs.core/html/00028.html @@ -1,16 +1,17 @@ -<html><head><title>Reconnecting to existing</title> +<html><head><title>Reconnecting an existing 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>Reconnecting to existing</h2> +</head><h2>Reconnecting an existing project</h2> <p>Since: 3.0 M6<br> -Last Modified: $Date: 2004/01/13 18:46:26 $</p><body> +Last Modified: $Date: 2004/02/25 20:34:42 $</p><body> <p> The following scenario represents how a user would reconnect a project that does not contain CVS meta-data to it's remote counterpart. It is assumed that the local project was derived from a previous version of the remote project but both the local project and the remote may have been modified since then. </p> +<h3>Scenario 1: Existing location using project name</h3> <p>Perform the following steps:</p> <ol> <li>Load an existing project (using Checkout or some other means)</li> @@ -19,19 +20,33 @@ the remote may have been modified since then. <li>Optionally, modify the remote contents of some resources using a separate checkout</li> <li>Perform a Team>Share Project and select CVS (if there is more than one repository provider available).</li> - <li>Select the repository the project was loaded from and click OK.</li> - <li>You will be prompted that the project already exists. Click Yes to continue. - In the next dialog that appears, select HEAD as the branch to share with.</li> - <li>Click Finish. This will close the wizard and show the sync view.</li> - <li>When the background job is completed, ensure that all folders (except new ones) - are marked as in-sync and all files (except new ones) are conflicting additions. - <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> + <li>Select the repository the project was loaded from and click Next.</li> + <li>Use the project name as the module name. Click Next.</li> + <li>In the tag page, select HEAD as the branch to share with and click Next</li> + <li>In the sharing page, only the files that do not have the same contents + as the server should appear. Perform a Mark as Merged or Commit on these + files. + <li>Click Finish.</li> +</ol> + +<h3>Scenario 1: New location using curstom module name</h3> +<p>Perform the following steps:</p> +<ol> + <li>Load an existing project using Checkout As and a different name</li> + <li>Disconnect the project and indicate that CVS meta-data is to be deleted</li> + <li>Discard the repository location<li> + <li>Modify some local resources</li> + <li>Optionally, modify the remote contents of some resources using a separate checkout</li> + <li>Perform a Team>Share Project and select CVS (if there is more than one + repository provider available).</li> + <li>Select to create a new repository and click Next</li> + <li>Enter the repository information for the repository and click Next</li> + <li>Enter the name of the module that the project was loaded from. Click Next.</li> + <li>In the tag page, select HEAD as the branch to share with and click Next</li> + <li>In the sharing page, only the files that do not have the same contents + as the server should appear. Perform a Mark as Merged or Commit on these + files. + <li>Click Finish.</li> </ol> </body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.team.tests.cvs.core/html/00050.html b/tests/org.eclipse.team.tests.cvs.core/html/00050.html new file mode 100644 index 000000000..d232bd08f --- /dev/null +++ b/tests/org.eclipse.team.tests.cvs.core/html/00050.html @@ -0,0 +1,35 @@ +<html><head><title>Sharing a new 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>Sharing a new project</h2> +<p>Since: 3.0 M8<br> +Last Modified: $Date: 2003/11/27 22:04:58 $</p><body> + +<h3>Scenario 1: Existing location using project name</h3> +<p>Perform the following steps:</p> +<ol> + <li>Create a new project that does not exist in the repository</li> + <li>Select Team>Share and select CVS (if there is more than one + repository provider available).</li> + <li>Select a repository and click Next</li> + <li>Use the project name as the module name. Click Next.</li> + <li>After a time, the last page should show the outgoing changes in the project. + Commit the changes from the synchronize pane.</li> + <li>Click Finish</li> +</ol> + +<h3>Scenario 2: New location using different name</h3> +<p>Perform the following steps:</p> +<ol> + <li>Create a new project</li> + <li>Select Team>Share and select CVS (if there is more than one + repository provider available).</li> + <li>Select to create a new repository and click Next</li> + <li>Enter the repository information for a new repository and click Next</li> + <li>Enter a single segment module name that does not exist in the repository and click Next.</li> + <li>After a time, the last page should show the outgoing changes in the project. + Commit the changes from the synchronize pane.</li> + <li>Click Finish</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 9995105e3..59ebfce8a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/toc.xml +++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml @@ -53,7 +53,9 @@ <topic label="Sharing" href="html/00026.html"> <topic label="Sharing as a subfolder" href="html/00027.html"> </topic> - <topic label="Reconnecting to existing" href="html/00028.html"> + <topic label="Reconnecting an existing project" href="html/00028.html"> + </topic> + <topic label="Sharing a new project" href="html/00050.html"> </topic> </topic> <topic label="Patching" href="html/00029.html"> |