blob: ac2debf7c696563fdaf676abea28503e47ea1fff [file] [log] [blame]
<?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">
<h3>Making your own changes</h3>
<p>Let's imagine that the user have a shared project "Some project" associated with his workspace copy. There are files "some_file.txt" and "another_file.cpp" containing in the main project folder. So the user decides to make some changes to this great project.</p>
<img border = "0" src="../../images/some_project.png" alt="Some project"/>
<p>For example the user added the "//I wrote this comment to se my changes in the compare editor" line to the end of "another_file.cpp". Then the user saves the changes. Then the user synchronizes the state of the project. The "another_file.cpp" in the 'Synchronize View' would be marked with an outgoing change decoration. To view the changes the user simply has simply double click on the file and the compare editor opens, showing the local file contests on the left and the remote file contents on the right as follows:</p>
<img border = "0" src="../../images/own_change.png" alt="Your own changes"/>
<p>After making sure that the changes are convenient the user commits this file clicking, for example, on the <i>'Commit'</i> pop-up menu item of the "another.cpp" file.<br/>The work is done.</p>
<img border="0" src="../../images/rel_tops.png" alt="Related topics"/>
<br/>
<a href="../../teamSupport/workspace_synch.php">SVN Workspace Synchronization</a>
<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/override.php">Overriding operations</a>
<br/>
<br/>
</div>
EOHTML;
# Generate the web page
$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>