Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Valenta2003-12-15 19:11:59 +0000
committerMichael Valenta2003-12-15 19:11:59 +0000
commit19f6c1ec6e840de63cb8db339735e814c96fc991 (patch)
tree279dbd7c9fda20f9999964941671eef1354befbc /tests
parent2117ff3020a5da293da296b9a516e4ba84e8e124 (diff)
downloadeclipse.platform.team-19f6c1ec6e840de63cb8db339735e814c96fc991.tar.gz
eclipse.platform.team-19f6c1ec6e840de63cb8db339735e814c96fc991.tar.xz
eclipse.platform.team-19f6c1ec6e840de63cb8db339735e814c96fc991.zip
*** empty log message ***
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00028.html37
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/toc.xml2
2 files changed, 39 insertions, 0 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
new file mode 100644
index 000000000..120ebe45e
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00028.html
@@ -0,0 +1,37 @@
+<html><head><title>Reconnecting to existing</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>
+<p>Since: <br>
+Last Modified: $Date: 2003/11/27 22:04:58 $</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>
+<p>Perform the following steps:</p>
+<ol>
+ <li>Load an existing project (using Checkout or some other means)</li>
+ <li>Disconnect the project and indicate that CVS meta-data is to be deleted</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 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>
+</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 06ba44433..2114fbf59 100644
--- a/tests/org.eclipse.team.tests.cvs.core/toc.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml
@@ -43,6 +43,8 @@
<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>
</topic>
</topic>
</toc>

Back to the top