Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-03-02 05:23:42 +0000
committerJean Michel-Lemieux2004-03-02 05:23:42 +0000
commitaab84e646a573615c9f9d93cbb2ab79debe5e168 (patch)
tree4b8d6ae3132acb83022a16005b36afac6517440c
parent1838546a58fb3d5de008d81f42d19a17b36f74d3 (diff)
downloadeclipse.platform.team-aab84e646a573615c9f9d93cbb2ab79debe5e168.tar.gz
eclipse.platform.team-aab84e646a573615c9f9d93cbb2ab79debe5e168.tar.xz
eclipse.platform.team-aab84e646a573615c9f9d93cbb2ab79debe5e168.zip
*** empty log message ***
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/html/00041.html12
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/toc.xml2
2 files changed, 11 insertions, 3 deletions
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 6013cc6fd..0afb31ffa 100644
--- a/tests/org.eclipse.team.tests.cvs.core/html/00041.html
+++ b/tests/org.eclipse.team.tests.cvs.core/html/00041.html
@@ -4,12 +4,18 @@
<meta NAME="since" content="">
</head><h2>File Revisions</h2>
<p>Since: M8<br>
-Last Modified: $Date: 2003/11/27 22:04:58 $</p><body>
+Last Modified: $Date: 2004/03/02 05:19:21 $</p><body>
Comparing
-> Team > Synchronize with Repository... (file, folder)
--> Compare With > latest on branch/version (file, folder)
- three way is possible with default cvs workspace subscriber
+ - prompt at the end with list of NEW changes found
+ - select sync'd files/folders in the sync view and the sync view is shown
+ - optional: could open any file editors if files where in the selection to refresh
+
+-> Team > Merge (file, folder)
+ - this is really a 3-way compare, so somewhat similar to the other 2-way compare shown below
+ - could show complete compare in the wizard, and similarly to compare, allow option for remembering the merge
+
-> Compare With > Two other branches or versions (file, folder) [note: this is meant to be a quick way of comparing two lineups you don't have locally. instead of having to browse the repo view all the time]
-> Compare With > Another branch/version (file, folder)
-> Compare With > Revision (file)
diff --git a/tests/org.eclipse.team.tests.cvs.core/toc.xml b/tests/org.eclipse.team.tests.cvs.core/toc.xml
index 9ce6036d7..f4b301bc7 100644
--- a/tests/org.eclipse.team.tests.cvs.core/toc.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/toc.xml
@@ -15,6 +15,8 @@
</topic>
<topic label="Reverting deleted resources" href="html/00040.html">
</topic>
+ <topic label="File Revisions" href="html/00041.html">
+ </topic>
</topic>
<topic label="Synchronizing" href="html/00010.html">
<topic label="Sync View operations and selection" href="html/00011.html">

Back to the top