documentation/teamSupport/merge_dialog.php

<?php  																														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: 		Denis Roy
	# Date:			2005-06-16
	#
	# Description: Type your page comments here - these are not sent to the browser
	#
	#
	#****************************************************************************
	
	#
	# Begin: page-specific settings.  Change these. 
	$pageTitle 		= "Subversive - SVN Team Client";
	$pageKeywords	= "Subversive, Subversion, SVN, Team Provider";
	$pageAuthor		= "Igor Vinnykov";
	
	# Add page-specific Nav bars here
	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);

	# End: page-specific settings
	#
		
	# Paste your HTML content between the EOHTML markers!	
	$html = <<<EOHTML

	<div id="midcolumn">

<h2>SVN Merge Dialog</h2>
	<p>This dialog appears when the user clicks on <i>'Team>Merge...'</i> menu item in the pop-up menu of the resource linked with the repository location, <i>'Merge...'</i> menu item of the SVN main menu group or on the <i>'Merge...'</i> button on the <i>'SVN Toolbar'</i>. There are Simple and Advanced merge modes. In simple mode the user can merge his local version with some remote one. And in advance mode user can merge his local copy with resources from different URLs. The merge operation in both modes also can be performed with some rage of revisions.</p>
	<p>This is how the dialog in the Simple mode looks like:</p>
	<img border = "0" src="../images/merge_simple.png" alt="Merge dialog in a simple mode"/>
	<br/>
	<br/>
	<table cellpadding="5" cellspacing="0" border="1" width="100%">
		<tr>
			<td class="header" align ="center" valign="center">Option</td>
			<td class="header" align ="center" valign="center">Description</td>
			<td class="header" align ="center" valign="center">Default</td>
		</tr>
		<tr>
			<td align ="center" valign="center">URL</td>
			<td align ="center" valign="center">Specifies the remote resource location</td>
			<td align ="center" valign="center">'blank'</td>
		</tr>
		<tr>
			<td align ="center" valign="center">Start revision</td>
			<td align ="center" valign="center">Specifies the minimum merge range revision number.</td>
			<td align ="center" valign="center">Head</td>
		</tr>
		<tr>
			<td align ="center" valign="center">Stop revision</td>
			<td align ="center" valign="center">Specifies the maximum merge range revision number.</td>
			<td align ="center" valign="center">Head</td>
		</tr>
	</table>
	<p>This is how the dialog in the Advance mode looks like:</p>
	<img border = "0" src="../images/merge_advance.png" alt="Merge dialog in an advance mode"/>
	<br/>
	<br/>
	<table cellpadding="5" cellspacing="0" border="1" width="100%">
		<tr>
			<td class="header" align ="center" valign="center">Option</td>
			<td class="header" align ="center" valign="center">Description</td>
			<td class="header" align ="center" valign="center">Default</td>
		</tr>
		<tr>
			<td align ="center" valign="center">URL1</td>
			<td align ="center" valign="center">Specifies the first remote resource location</td>
			<td align ="center" valign="center">'blank'</td>
		</tr>
		<tr>
			<td align ="center" valign="center">URL2</td>
			<td align ="center" valign="center">Specifies the second remote resource location</td>
			<td align ="center" valign="center">'blank'</td>
		</tr>
		<tr>
			<td align ="center" valign="center">Start revision</td>
			<td align ="center" valign="center">Specifies the minimum merge range revision number.</td>
			<td align ="center" valign="center">Head</td>
		</tr>
		<tr>
			<td align ="center" valign="center">Stop revision</td>
			<td align ="center" valign="center">Specifies the maximum merge range revision number.</td>
			<td align ="center" valign="center">Head</td>
		</tr>
		<tr>
			<td align ="center" valign="center">Ignore Ancestry</td>
			<td align ="center" valign="center">Specifies if Subversion&reg should ignore the ancestry of resources while merging.</td>
			<td align ="center" valign="center">Disabled</td>
		</tr>
	</table>
	<p>With the <i>'Preview'</i> button the user can inspect the consequences of the merge operation.</p>
	<img border="0" src="../images/rel_tops.png" alt="Related topics"/>
	<br/>
	<a href="../teamSupport/svn_main_menu.php">'SVN' main menu group</a>
	<br/>
	<a href="../teamSupport/svn_toolbar.php">SVN Toolbar</a>
	<br/>
	<a href="../teamSupport/SVNaction/merge.php">Merging</a>
	<br/>
	<br/>
	</div>	

EOHTML;


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