documentation/teamSupport/workspace_synch.php

<?php
	set_include_path($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common" . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] . "/projects" . PATH_SEPARATOR . get_include_path()); 
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); 
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");  
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");  
	$App = new App(); 
	$Nav = new Nav(); 
	$Menu = new Menu();  
	include($App->getProjectCommon());    
	# All on the same line to unclutter the user's desktop'

	#*****************************************************************************
	#
	# template.php
	#
	# Author: 		Igor Vinnykov
	# Date:			2008-04-25
	#
	# Description: Autogenerated for eclipse.org site pages from Eclipse IDE help
	#
	#
	#****************************************************************************
	
	#
	# Begin: page-specific settings.  Change these. 
	$pageTitle 		= "Eclipse Subversive - Documentation";
	$pageKeywords	= "Subversive, Subversion, SVN, Team Provider, documentation, user guid";
	$pageAuthor		= "Igor Vinnykov";

	include("_projectCommon.php");    # All on the same line to unclutter the user's desktop'
	
	# Paste your HTML content between the EOHTML markers!	
	$html = <<<EOHTML

	<div id="midcolumn">

<h2>SVN Workspace Synchronization</h2>
	<p>SVN Workspace Synchronization is shown in the <i>'Synchronize View'</i> after a click on a <i>'Team>Synchronize'</i> menu item or <i>'Synchronize'</i> button on <i>'Team'</i> toolbar of the <i>'Team Synchronizing'</i> perspective. It provides a probability to inspect the changes types of your local copy from the remote one.</p>
	<p>This is how <i>'SVN Workspace Synchronization'</i> in the <i>'Synchronize View'</i> looks like:</p>
	<img border = "0" src="../images/synch_view.png" alt="Synchronize View"/>
	<p><b>Synchronization state</b></p>
	<p>The synchronization state is shown with the help of the following icon decorations:</p>
	<table cellpadding="5" cellspacing="0" border="1" width="100%">
		<tr>
			<td class="header" align ="center" valign="center">Icon</td>
			<td class="header" align ="center" valign="center">Description</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/income_add.png" alt="Incoming addition"/></td>
			<td align ="center" valign="center">An incoming addition icon means, that the marked resource was added to a repository location, so it's  new comparatively to the local copy. It will be added to the local copy after update action.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/income_change.png" alt="Incoming change"/>
			</td>
			<td align ="center" valign="center">An incoming change icon means, that some changes to the marked file were made  comparatively to your local copy. The changes will be added to the local copy after update action.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/income_del.png" alt="Incoming deletion"/>
			</td>
			<td align ="center" valign="center">An incoming deletion icon means, that this resource was deleted from a repository location, but it's  still contained in the local copy. It will be deleted from the local copy after update.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/outgo_add.png" alt="Outgoing addition"/>
			</td>
			<td align ="center" valign="center">An outgoing addition icon means, that the marked resource was added to the local copy, so it's  new comparatively to the repository location. It will be added to the repository after commit action.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/outgo_change.png" alt="Outgoing change"/>
			</td>
			<td align ="center" valign="center">An outgoing change icon means, that some changes to the marked file were made comparatively to the repository location. The changes will be added to the repository after commit action.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/outgo_del.png" alt="Outgoing deletion"/>
			</td>
			<td align ="center" valign="center">An outgoing deletion icon means, that the marked resource was deleted from the local copy, but it's still contained in the repository location. It will be deleted the repository after commit action.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/conflict_add.png" alt="Conflict addition"/>
			</td>
			<td align ="center" valign="center">A conflict addition icon means, that to different resources with the marked resource name were added both to the repository location and to the local copy.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/conflict_change.png" alt="Conflict change"/>
			</td>
			<td align ="center" valign="center">A conflict change icon means, that the changes, that can't be merged automatically were made both with local copy and repository one. A manual merge is required. The parents of the decorated resource will be also decorated.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/conflict_del.png" alt="Conflict deletion"/>
			</td>
			<td align ="center" valign="center">A conflict deletion icon means, that both local and repository's copy of the resource were deleted.</td>
		</tr>
		<tr>
			<td align ="center" valign="center">
				<img border = "0" src="../images/prop_changed.png" alt="Properties change"/>
			</td>
			<td align ="center" valign="center">A properties change icon means, that the properties of local or repository's resource were changed.</td>
		</tr>
	</table>
	<br/>
	<p><b><i>Toolbar</i></b></p>
	<p><b>Synchronize (<img src="../images/synch_button.gif">)</b> - starts synchronization with repository.</p>
	<p><b>Pin Current Synchronization (<img src="../images/pin.gif">)</b> - pins current synchronization, so other started synchronizations will be shown in another synchronization view.</p>
	<p><b>Next difference (<img src="../images/next.gif">)</b> - shows the next difference of the resources.</p>
	<p><b>Previous difference (<img src="../images/prev.gif">)</b> - shows the previous difference of the resources.</p>
	<p><b>Collapse all (<img src="../images/collapseall.gif">)</b> - redraws the view collapsing all expanded items.</p>
	<p><b>Expand all (<img src="../images/expandall.gif">)</b> - redraws the view expanding all collapsed items.</p>
	<p><b>Incoming mode (<img src="../images/show_in.gif">)</b> - redraws the view showing only incoming changes.</p>
	<p><b>Outgoing mode (<img src="../images/show_out.gif">)</b> - redraws the view showing only outgoing changes.</p>
	<p><b>Incoming/outgoing mode (<img src="../images/show_both.gif">)</b> - redraws the view showing both incoming and outgoing changes.</p>
	<p><b>Conflict mode (<img src="../images/show_conf.gif">)</b> - redraws the view showing only conflict changes.</p>
	<p><b>Update All Incoming Changes (<img src="../images/update.gif">)</b> - activates the update action for all incoming changes.</p>
	<p><b>Commit All Outgoing Changes (<img src="../images/commit.gif">)</b> - activates the commit action for all outgoing changes.</p>
	<p><b>Show Change Sets (<img src="../images/changeset.gif">)</b> - displays specific model based on change sets. The view shows incoming changes grouped by commit comment which is handy for seeing who released what and why. For outgoing changes, the user can create change sets to group related changes.</p>
	<p><b>Drop-down menu:</b></p>
	<ul>
		<li>
			<b>Pin Current Synchronization (<img src="../images/pin.gif">)</b> - pins current synchronization.</li>
		<li>
		<li>
			<b>Remove Current Synchronization (<img src="../images/remove.gif">)</b> - removes current synchronization info from the view.</li>
		<li>
			<b>Remove Un-Pined Synchronization (<img src="../images/remove_all.gif">)</b> - removes all unpinned synchronizations from the view.
		</li>
		<li>
			<b>Mode</b> - offers the user to choose a synchronization mode (incoming, outgoing, both or conflict).
		</li>
		<li>
			<b>Presentation</b> - offers the user to choose presentation mode (flat, tree, compressed folders).
		</li>
		<li>
			<b>Preferences...</b> - opens Synchronization preferences window.
		</li>
		<li>
			<b>Schedule...</b> - offers to schedule the synchronize operation.
		</li>
		<li>
			<b>Show synchronization info contiguous</b> - shows synchronization for already synchronized 	resources, while the synchronization process for others is still running at background.
		</li>
	</ul>
	<p>
		<b>
			<i>Pop-up menu</i>
		</b>
	</p>
	<p><b>Open in compare editor (files only)</b> - opens the file in compare editor with its content on the left and repository file content on the right.</p>
	<p><b>Open (files only)</b> - opens the file with default editor.</p>
	<p><b>Open with... (files only)</b> - opens the file with probability to choose the editor.</p>
	<p><b>Edit</b> - provides a probability to copy, delete, move or rename a resource.</p>
	<p><b>Synchronize</b> - starts synchronization with repository.</p>
	<p><b>Remove from View</b> - removes the selected resource from the view. It will reappear in the view if it's synchronization status changes.</p>
	<p><b>Update</b> - activates the update action for the selected resource.</p>
	<p><b>Commit...</b> - activates the commit action for the selected resource.</p>
	<p><b>Override and update... (<img src="../images/update.gif">)</b> - replaces the selected resource local copy with a repository one.</p>
	<p><b>Override and commit... (<img src="../images/commit.gif">)</b> - replaces the selected resource repository copy with a local one.	</p>
	<p><b>Mark as merged...</b> - mark the file as if it is already merged.</p>
	<p><b>Revert... (<img src="../images/revert.gif">)</b> - reverts the file changes to the unmodified state.</p>
	<p><b>Add to version control...</b> - adds a selected resource to version control.</p>
	<p><b>Add to svn:ignore...</b> - adds a selected resource to svn:ignore.</p>
	<p><b>Create Patch...</b> - creates patch based on local changes.</p>
	<p><b>Branch... (<img src="../images/branch.gif">)</b> - creates branch from working copy.</p>
	<p><b>Show History (<img src="../images/showhistory.gif">)</b> - shows SVN History View for a selected resource.</p>
	<p><b>Show Annotations</b> - shows annotation for a selected resource.</p>
	<p><b>Show Properties (<img src="../images/propertiesedit.gif">)</b> - shows SVN properties of a selected resource.</p>
	<p><b>Set Property...</b> - sets property on local resource.</p>
	<p><b>Set Keywords...</b> - sets keywords on local resource.</p>
	<p><b>Lock... (<img src="../images/lock.gif">)</b> - locks local resource.</p>
	<p><b>Unlock (<img src="../images/unlock.gif">)</b> - unlocks local resource.</p>
	<p><b>Clean-up</b> - performs clean-up for selected folder.</p>
	<img border="0" src="../images/rel_tops.png" alt="Related topics"/>
	<br/>
	<a href="../teamSupport/svn_label_decor.php">SVN Label Decorations</a>
	<br/>
	<a href="../teamSupport/SVNaction/commit.php">Committing</a>
	<br/>
	<a href="../teamSupport/SVNaction/update.php">Updating</a>
	<br/>
	<a href="../teamSupport/compare.php">Working with Compare Editor</a>
	<br/>
	<a href="../teamSupport/compareEditor/compare_oc.php">Making your own changes</a>
	<br/>
	<a href="../teamSupport/compareEditor/compare_ac.php">Another user changes</a>
	<br/>
	<a href="../teamSupport/compareEditor/compare_cc.php">Working with conflict changes</a>
	<br/>
	<br/>
	</div>	

EOHTML;


	# Generate the web page
	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>