summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalgorzata Janczarska2012-06-06 06:45:50 (EDT)
committerSzymon Brandys2012-06-06 06:51:29 (EDT)
commit0508c70eb05e9ad710a8b74af8618dcd91bd6877 (patch)
treef97a00b1f08d8860c8ed961413c0f23833b9f375
parentfccf4f328d5b664b2c8c65e09b69dea6ea004011 (diff)
downloadeclipse.platform.common-0508c70eb05e9ad710a8b74af8618dcd91bd6877.zip
eclipse.platform.common-0508c70eb05e9ad710a8b74af8618dcd91bd6877.tar.gz
eclipse.platform.common-0508c70eb05e9ad710a8b74af8618dcd91bd6877.tar.bz2
bug 364142 - Update the doc with the regex filter in CVS syncsv20120606-105129
-rw-r--r--bundles/org.eclipse.platform.doc.user/images/cvs-sync-compare.pngbin19422 -> 20682 bytes
-rw-r--r--bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm10
2 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.platform.doc.user/images/cvs-sync-compare.png b/bundles/org.eclipse.platform.doc.user/images/cvs-sync-compare.png
index 269178c..52b90af 100644
--- a/bundles/org.eclipse.platform.doc.user/images/cvs-sync-compare.png
+++ b/bundles/org.eclipse.platform.doc.user/images/cvs-sync-compare.png
Binary files differ
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
index ff58a59..f942bda 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
@@ -29,7 +29,7 @@
<tbody><tr>
<td align="left" valign="top" width="21%">Only look at timestamps to detect changes</td>
<td align="left" valign="top" width="58%">For more precise comparison,
- the contents can be compared. If performance is an issue this can be disabled
+ the contents can be compared. If performance is an issue this can be enabled
to use the much faster time stamp based comparison. This option only applies
to comparisons of remote resources or when comparing a selected project or folder
with a branch or version. The option is not honored in synchronizations launched
@@ -37,6 +37,14 @@
or the <b>Compare With &gt; Latest From &lt;branch/version&gt;</b> menu command.</td>
<td align="left" valign="top" width="21%">Disabled</td>
</tr>
+ <tr>
+ <td align="left" valign="top">Regular expression to ignore changes in synchronizations</td>
+ <td align="left" valign="top">This option controls which changes should be ignored during
+ content-based synchronizations i.e. when <b>Only look at timestamps to detect changes</b> is
+ disabled. If at least one side of the change matches the defined regular expression, the change
+ will be ignored.</td>
+ <td align="left" valign="top">&nbsp;</td>
+ </tr>
<tr>
<td align="left" valign="top">Show revision comparisons in dialog</td>
<td align="left" valign="top">Use this this option to show revision comparisons