diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html | 179 |
1 files changed, 90 insertions, 89 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html index 5f26b61e82..70fd03cc84 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html @@ -1,24 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> +<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> -<HEAD> -<TITLE>Working with Checkouts (CDO Model Repository Documentation)</TITLE> +<head> +<title>Working with Checkouts (CDO Model Repository Documentation)</title> -<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> +<link rel="stylesheet" href="../book.css" charset="UTF-8" type="text/css"> -<SCRIPT type="text/javascript"> +<noscript></noscript> +<script type="text/javascript"> function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { parent.document.title="Working with Checkouts (CDO Model Repository Documentation)"; } } -</SCRIPT> -<NOSCRIPT></NOSCRIPT> -</HEAD> +</script> +</head> -<BODY BGCOLOR="white" onload="windowTitle();"> -<!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a> > <a href="index.html" title="Category in CDO Model Repository Documentation">User's Guide</a></div> --> +<body bgcolor="white" onload="windowTitle();"> +<!-- <div class="help_breadcrumbs breadcrumbs_top"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a> > <a href="index.html" title="Category in CDO Model Repository Documentation">User's Guide</a></div> --> <table border="0"> <tr> @@ -35,47 +35,47 @@ function windowTitle() A checkout represents a <i>named</i> combination of the following pieces of information: <ul> <li> A configured repository (see <a href="Doc02_ManagingRepositories.html#Doc_CreatingRepositories" title="Chapter in CDO Model Repository Documentation">Creating Repositories and Connections</a> for details on how to create and configure repositories), - <li> a <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a> that determines from what <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> and from - what <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>time</code></a> the models of the checkout are shown, and + <li> a <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch point</code></a> that determines from what <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>branch</code></a> and from + what <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>time</code></a> the models of the checkout are shown, and <li> an object to be used as the root object of the checkout's model tree. By default this is the - <a href="../../javadoc/org/eclipse/emf/cdo/view/CDOView.html" title="Interface in org.eclipse.emf.cdo.view"><code>root resource</code></a> of the repository. + <a href="../../javadoc/org/eclipse/emf/cdo/view/CDOView.html#getRootResource()" title="Method in org.eclipse.emf.cdo.view.CDOView"><code>root resource</code></a> of the repository. </ul> <p> Once created, checkouts are displayed in the Project Explorer like workspace projects and decorated with a small blue repository image. - In contrast to workspace projects the displayed checkouts have no physical representation in the workspace. <p align="center"><img src="project-explorer.png"></p> + In contrast to workspace projects the displayed checkouts have no physical representation in the workspace. <p align="center"><img src="project-explorer.png"> <p> <b>Table of Contents</b> <p> <table border="0"> -<tr><td>1 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_RenamingCheckouts" title="Chapter in CDO Model Repository Documentation">Renaming Checkouts</a></td></tr> -<tr><td>2 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_DuplicatingCheckouts" title="Chapter in CDO Model Repository Documentation">Duplicating Checkouts</a></td></tr> -<tr><td>3 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_OpeningClosing" title="Chapter in CDO Model Repository Documentation">Opening and Closing Checkouts</a></td></tr> -<tr><td>4 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_DeletingCheckouts" title="Chapter in CDO Model Repository Documentation">Deleting Checkouts</a></td></tr> -<tr><td>5 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_SwitchingBranch" title="Chapter in CDO Model Repository Documentation">Switching the Branch of a Checkout</a></td></tr> -<tr><td></td><td>5.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchNewBranch" title="Chapter in CDO Model Repository Documentation">Switching to a New Branch</a></td></tr> -<tr><td></td><td>5.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchOtherBranch" title="Chapter in CDO Model Repository Documentation">Switching to an Other Branch</a></td></tr> -<tr><td>6 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_SwitchingBranchPoint" title="Chapter in CDO Model Repository Documentation">Switching the Time Stamp of a Checkout</a></td></tr> -<tr><td></td><td>6.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Switching to an Other Branch Point</a></td></tr> -<tr><td></td><td>6.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchCommit" title="Chapter in CDO Model Repository Documentation">Switching to a Commit</a></td></tr> -<tr><td>7 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_ComparingCheckouts" title="Chapter in CDO Model Repository Documentation">Comparing Checkouts</a></td></tr> -<tr><td></td><td>7.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareOtherBranch" title="Chapter in CDO Model Repository Documentation">Comparing with an Other Branch</a></td></tr> -<tr><td></td><td>7.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Comparing with an Other Branch Point</a></td></tr> -<tr><td></td><td>7.3 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareCommit" title="Chapter in CDO Model Repository Documentation">Comparing with a Commit</a></td></tr> -<tr><td>8 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_MergingCheckouts" title="Chapter in CDO Model Repository Documentation">Merging Checkouts</a></td></tr> -<tr><td></td><td>8.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeOtherBranch" title="Chapter in CDO Model Repository Documentation">Merging from an Other Branch</a></td></tr> -<tr><td></td><td>8.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Merging from an Other Branch Point</a></td></tr> -<tr><td></td><td>8.3 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeCommit" title="Chapter in CDO Model Repository Documentation">Merging from a Commit</a></td></tr> -<tr><td>9 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowIn" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in Other Views</a></td></tr> -<tr><td></td><td>9.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInSessions" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Sessions View</a></td></tr> -<tr><td></td><td>9.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInTimeMachine" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Time Machine View</a></td></tr> -<tr><td></td><td>9.3 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInServerBrowser" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Server Browser</a></td></tr> -<tr><td></td><td>9.4 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInProperties" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the Properties View</a></td></tr> -<tr><td></td><td>9.5 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInHistory" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the History View</a></td></tr> -<tr><td></td><td>9.6 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInSystemExplorer" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the System Explorer</a></td></tr> -<tr><td>10 </td><td colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_UsingOfflineCheckouts" title="Chapter in CDO Model Repository Documentation">Working with Offline Checkouts</a></td></tr> -<tr><td></td><td>10.1 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineUpdate" title="Chapter in CDO Model Repository Documentation">Updating an Offline Checkout</a></td></tr> -<tr><td></td><td>10.2 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineCheckin" title="Chapter in CDO Model Repository Documentation">Checking In an Offline Checkout</a></td></tr> -<tr><td></td><td>10.3 </td><td colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineRevert" title="Chapter in CDO Model Repository Documentation">Reverting an Offline Checkout</a></td></tr> +<tr><td>1 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_RenamingCheckouts" title="Chapter in CDO Model Repository Documentation">Renaming Checkouts</a></td></tr> +<tr><td>2 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_DuplicatingCheckouts" title="Chapter in CDO Model Repository Documentation">Duplicating Checkouts</a></td></tr> +<tr><td>3 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_OpeningClosing" title="Chapter in CDO Model Repository Documentation">Opening and Closing Checkouts</a></td></tr> +<tr><td>4 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_DeletingCheckouts" title="Chapter in CDO Model Repository Documentation">Deleting Checkouts</a></td></tr> +<tr><td>5 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_SwitchingBranch" title="Chapter in CDO Model Repository Documentation">Switching the Branch of a Checkout</a></td></tr> +<tr><td></td><td>5.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchNewBranch" title="Chapter in CDO Model Repository Documentation">Switching to a New Branch</a></td></tr> +<tr><td></td><td>5.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchOtherBranch" title="Chapter in CDO Model Repository Documentation">Switching to an Other Branch</a></td></tr> +<tr><td>6 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_SwitchingBranchPoint" title="Chapter in CDO Model Repository Documentation">Switching the Time Stamp of a Checkout</a></td></tr> +<tr><td></td><td>6.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Switching to an Other Branch Point</a></td></tr> +<tr><td></td><td>6.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_SwitchCommit" title="Chapter in CDO Model Repository Documentation">Switching to a Commit</a></td></tr> +<tr><td>7 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_ComparingCheckouts" title="Chapter in CDO Model Repository Documentation">Comparing Checkouts</a></td></tr> +<tr><td></td><td>7.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareOtherBranch" title="Chapter in CDO Model Repository Documentation">Comparing with an Other Branch</a></td></tr> +<tr><td></td><td>7.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Comparing with an Other Branch Point</a></td></tr> +<tr><td></td><td>7.3 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CompareCommit" title="Chapter in CDO Model Repository Documentation">Comparing with a Commit</a></td></tr> +<tr><td>8 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_MergingCheckouts" title="Chapter in CDO Model Repository Documentation">Merging Checkouts</a></td></tr> +<tr><td></td><td>8.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeOtherBranch" title="Chapter in CDO Model Repository Documentation">Merging from an Other Branch</a></td></tr> +<tr><td></td><td>8.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeOtherBranchPoint" title="Chapter in CDO Model Repository Documentation">Merging from an Other Branch Point</a></td></tr> +<tr><td></td><td>8.3 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_MergeCommit" title="Chapter in CDO Model Repository Documentation">Merging from a Commit</a></td></tr> +<tr><td>9 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowIn" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in Other Views</a></td></tr> +<tr><td></td><td>9.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInSessions" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Sessions View</a></td></tr> +<tr><td></td><td>9.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInTimeMachine" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Time Machine View</a></td></tr> +<tr><td></td><td>9.3 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInServerBrowser" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the CDO Server Browser</a></td></tr> +<tr><td></td><td>9.4 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInProperties" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the Properties View</a></td></tr> +<tr><td></td><td>9.5 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInHistory" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the History View</a></td></tr> +<tr><td></td><td>9.6 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_CheckoutShowInSystemExplorer" title="Chapter in CDO Model Repository Documentation">Showing Checkouts in the System Explorer</a></td></tr> +<tr><td>10 </td><td class="te" colspan="4"><a href="Doc05_UsingCheckouts.html#Doc_UsingOfflineCheckouts" title="Chapter in CDO Model Repository Documentation">Working with Offline Checkouts</a></td></tr> +<tr><td></td><td>10.1 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineUpdate" title="Chapter in CDO Model Repository Documentation">Updating an Offline Checkout</a></td></tr> +<tr><td></td><td>10.2 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineCheckin" title="Chapter in CDO Model Repository Documentation">Checking In an Offline Checkout</a></td></tr> +<tr><td></td><td>10.3 </td><td class="te" colspan="3"><a href="Doc05_UsingCheckouts.html#Doc_OfflineRevert" title="Chapter in CDO Model Repository Documentation">Reverting an Offline Checkout</a></td></tr> </table> </p> @@ -84,7 +84,7 @@ function windowTitle() <p> CDO supports renaming an existing checkout, i.e., changing its label, at any time. A checkout can be renamed by selecting it and pressing the F2 key or selecting the Rename action in the context menu. The following dialog will pop up: - <p align="center"><img src="checkout-rename.png"></p> + <p align="center"><img src="checkout-rename.png"> <p> The dialog can only be finished with the OK button if the checkout label is either unchanged or changed to a not existing label. @@ -93,7 +93,7 @@ function windowTitle() <p> Sometimes it is useful to have two or more checkouts from the same repository in the Project Explorer. A checkout can be duplicated by selecting it, opening the context menu, and selecting the Duplicate Checkout action. - The result is an identical checkout with a unique default label: <p align="center"><img src="checkout-duplicate.png"></p> + The result is an identical checkout with a unique default label: <p align="center"><img src="checkout-duplicate.png"> <h2><a name="Doc_OpeningClosing"></a>3 Opening and Closing Checkouts</h2> @@ -109,7 +109,7 @@ function windowTitle() <p> An existing checkout can be deleted by selecting that checkout and pressing the Del key or selecting the Delete action in the context menu. Several checkouts can be deleted at once. - The following dialog will pop up: <p align="center"><img src="checkout-delete.png"></p> + The following dialog will pop up: <p align="center"><img src="checkout-delete.png"> <p> Deleting a checkout does not delete the associated repository or any data in it. @@ -120,7 +120,7 @@ function windowTitle() <p> Online transactional checkouts from repositories that are configured with the versioning mode <b>branching</b> can be switched to other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branches</code></a> by selecting the checkout, opening the context menu and selecting the Switch To sub menu: - <p align="center"><img src="switch-to-branch.png"></p> + <p align="center"><img src="switch-to-branch.png"> <p> See <a href="../operators/Doc01_ConfiguringRepositories.html#Property_supportingBranches" title="Chapter in CDO Model Repository Documentation">Property supportingBranches</a> for instructions on how to enable branching for @@ -152,7 +152,7 @@ function windowTitle() <h3><a name="Doc_SwitchNewBranch"></a>5.1 Switching to a New Branch</h3> <p> Online transactional checkouts can be switched to a newly created branch with the Switch To -> New Branch context menu action. - The New Branch dialog will pop up: <p align="center"><img src="branch-create.png"></p> + The New Branch dialog will pop up: <p align="center"><img src="branch-create.png"> <p> See <a href="Doc03_UsingBranches.html#Doc_CreatingBranches" title="Chapter in CDO Model Repository Documentation">Creating Branches</a> for an explanation on how to use the New Branch dialog. @@ -160,14 +160,14 @@ function windowTitle() <h3><a name="Doc_SwitchOtherBranch"></a>5.2 Switching to an Other Branch</h3> <p> Online transactional checkouts can be switched to any other branch with the Switch To -> Other Branch context menu action. - The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"></p> + The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"> . <h2><a name="Doc_SwitchingBranchPoint"></a>6 Switching the Time Stamp of a Checkout</h2> <p> Online historical checkouts from repositories that are configured with the versioning modes <b>auditing</b> or <b>branching</b> can be switched to other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch points</code></a> by selecting the checkout, opening the context menu and selecting the Switch To sub menu: - <p align="center"><img src="switch-to-branchpoint.png"></p> + <p align="center"><img src="switch-to-branchpoint.png"> <p> See <a href="../operators/Doc01_ConfiguringRepositories.html#Property_supportingAudits" title="Chapter in CDO Model Repository Documentation">Property supportingAudits</a> for instructions on how to enable auditing remote repositories, @@ -185,7 +185,7 @@ function windowTitle() Switching the branch point of a checkout is also possible by dragging elements and dropping them onto the target checkout without holding any modifier keys pressed. The following elements can be dropped on to the target: <ul> - <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>heads</code></a> + <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranch"><code>heads</code></a> <li> The repository of the target checkout (inducing the head of its main branch) <li> Online historical checkouts from the same repository as the selected checkout (inducing their branch points) <li> Commits, for example from the <a href="Doc01_UserInterface.html#Doc_HistoryIntegration" title="Chapter in CDO Model Repository Documentation">History view</a> @@ -205,21 +205,21 @@ function windowTitle() <h3><a name="Doc_SwitchOtherBranchPoint"></a>6.1 Switching to an Other Branch Point</h3> <p> Online historical checkouts can be switched to any other branch point with the Switch To -> Other Branch Point context menu action. - The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"></p> + The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"> . <h3><a name="Doc_SwitchCommit"></a>6.2 Switching to a Commit</h3> <p> Online historical checkouts can be switched to a commit with the Switch To -> Commit context menu action. - The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"></p> + The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"> . <h2><a name="Doc_ComparingCheckouts"></a>7 Comparing Checkouts</h2> <p> - All types of checkouts can be compared with other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>time stamps</code></a> or - other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branches</code></a> from the same repository + All types of checkouts can be compared with other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>time stamps</code></a> or + other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>branches</code></a> from the same repository by selecting the checkout, opening the context menu and selecting the Compare With sub menu: - <p align="center"><img src="compare-with.png"></p> + <p align="center"><img src="compare-with.png"> <p> The Compare With sub menu consists of the following action groups: @@ -234,7 +234,7 @@ function windowTitle() Comparing a checkout is also possible by dragging elements and dropping them onto the target checkout with the Shift and Ctrl keys pressed. The following elements can be dropped onto the target: <ul> - <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>heads</code></a> + <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranch"><code>heads</code></a> <li> The repository of the target checkout (inducing the head of its main branch) <li> Checkouts from the same repository as the selected checkout (inducing their branch points) <li> Commits, for example from the <a href="Doc01_UserInterface.html#Doc_HistoryIntegration" title="Chapter in CDO Model Repository Documentation">History view</a> @@ -242,7 +242,7 @@ function windowTitle() <p> When a checkout is compared with a different branch point an EMF Compare editor is opened with the left side showing the selected compare source (e.g., the drag source) and the right side showing the selected compare target - (e.g., the drop target): <p align="center"><img src="compare.png"></p> + (e.g., the drop target): <p align="center"><img src="compare.png"> <p><b>See Also:</b></p> <ul> <li><a href="Doc01_UserInterface.html#Doc_RepositoriesView" title="Chapter in CDO Model Repository Documentation">CDO Repositories View</a></li> @@ -255,27 +255,27 @@ function windowTitle() <h3><a name="Doc_CompareOtherBranch"></a>7.1 Comparing with an Other Branch</h3> <p> Checkouts can be compared with any other branch with the Compare With -> Other Branch context menu action. - The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"></p> + The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"> . <h3><a name="Doc_CompareOtherBranchPoint"></a>7.2 Comparing with an Other Branch Point</h3> <p> Checkouts can be compared with any other branch point with the Compare With -> Other Branch Point context menu action. - The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"></p> + The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"> . <h3><a name="Doc_CompareCommit"></a>7.3 Comparing with a Commit</h3> <p> Checkouts can be compared with a commit with the Compare With -> Commit context menu action. - The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"></p> + The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"> . <h2><a name="Doc_MergingCheckouts"></a>8 Merging Checkouts</h2> <p> - Offline and online transactional checkouts can be merged from other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>time stamps</code></a> or - other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branches</code></a> from the same repository + Offline and online transactional checkouts can be merged from other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>time stamps</code></a> or + other <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranchPoint"><code>branches</code></a> from the same repository by selecting the checkout, opening the context menu and selecting the Merge From sub menu: - <p align="center"><img src="merge-from.png"></p> + <p align="center"><img src="merge-from.png"> <p> The Merge From sub menu consists of the following action groups: @@ -290,7 +290,7 @@ function windowTitle() Merging a checkout is also possible by dragging elements and dropping them onto the target checkout with the Shift and Ctrl keys pressed. The following elements can be dropped onto the target: <ul> - <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>heads</code></a> + <li> Branches of the same repository as the target checkout (inducing their <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead()" title="Method in org.eclipse.emf.cdo.common.branch.CDOBranch"><code>heads</code></a> <li> The repository of the target checkout (inducing the head of its main branch) <li> Checkouts from the same repository as the selected checkout (inducing their branch points) <li> Commits, for example from the <a href="Doc01_UserInterface.html#Doc_HistoryIntegration" title="Chapter in CDO Model Repository Documentation">History view</a> @@ -298,7 +298,7 @@ function windowTitle() <p> When a checkout is merged from a different branch point an EMF Merge editor is opened with the left side showing the selected merge source (e.g., the drag source) and the right side showing the selected merge target - (e.g., the drop target): <p align="center"><img src="merge.png"></p> + (e.g., the drop target): <p align="center"><img src="merge.png"> <p><b>See Also:</b></p> <ul> <li><a href="Doc01_UserInterface.html#Doc_RepositoriesView" title="Chapter in CDO Model Repository Documentation">CDO Repositories View</a></li> @@ -311,19 +311,19 @@ function windowTitle() <h3><a name="Doc_MergeOtherBranch"></a>8.1 Merging from an Other Branch</h3> <p> Checkouts can be merged from any other branch with the Merge From -> Other Branch context menu action. - The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"></p> + The Select Branch Point dialog (without a time stamp area) will pop up: <p align="center"><img src="branch-select.png"> . <h3><a name="Doc_MergeOtherBranchPoint"></a>8.2 Merging from an Other Branch Point</h3> <p> Checkouts can be merged from any other branch point with the Merge From -> Other Branch Point context menu action. - The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"></p> + The Select Branch Point dialog (with a time stamp area) will pop up: <p align="center"><img src="branchpoint-select.png"> . <h3><a name="Doc_MergeCommit"></a>8.3 Merging from a Commit</h3> <p> Checkouts can be merged from a commit with the Merge From -> Commit context menu action. - The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"></p> + The Select Commit dialog will pop up: <p align="center"><img src="commit-select.png"> . <h2><a name="Doc_CheckoutShowIn"></a>9 Showing Checkouts in Other Views</h2> @@ -331,18 +331,18 @@ function windowTitle() Checkouts can be shown in a number of other views depending on the type of the checkout by selecting them, opening their context menu, opening the Show In sub menu, and selecting one of the Show In actions. <p> - Online transactional checkouts can be shown in the following views: <p align="center"><img src="checkout-transactional-showin.png"></p> + Online transactional checkouts can be shown in the following views: <p align="center"><img src="checkout-transactional-showin.png"> <p> - Online historical checkouts can be shown in the following views: <p align="center"><img src="checkout-historical-showin.png"></p> + Online historical checkouts can be shown in the following views: <p align="center"><img src="checkout-historical-showin.png"> <p> - Offline checkouts can be shown in the following views: <p align="center"><img src="checkout-offline-showin.png"></p> + Offline checkouts can be shown in the following views: <p align="center"><img src="checkout-offline-showin.png"> <h3><a name="Doc_CheckoutShowInSessions"></a>9.1 Showing Checkouts in the CDO Sessions View</h3> <p> - Online checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_SessionsView" title="Chapter in CDO Model Repository Documentation">CDO Sessions view</a>: <p align="center"><img src="sessions-view.png"></p> + Online checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_SessionsView" title="Chapter in CDO Model Repository Documentation">CDO Sessions view</a>: <p align="center"><img src="sessions-view.png"> <p> A new <a href="../../javadoc/org/eclipse/emf/cdo/session/CDOSession.html" title="Interface in org.eclipse.emf.cdo.session"><code>session</code></a> with the same target repository as the selected checkout is opened in the CDO Sessions view. @@ -350,12 +350,12 @@ function windowTitle() <h3><a name="Doc_CheckoutShowInTimeMachine"></a>9.2 Showing Checkouts in the CDO Time Machine View</h3> <p> - Online histrical checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_TimeMachineView" title="Chapter in CDO Model Repository Documentation">CDO Time Machine view</a>: <p align="center"><img src="timemachine-view.png"></p> + Online histrical checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_TimeMachineView" title="Chapter in CDO Model Repository Documentation">CDO Time Machine view</a>: <p align="center"><img src="timemachine-view.png"> <h3><a name="Doc_CheckoutShowInServerBrowser"></a>9.3 Showing Checkouts in the CDO Server Browser</h3> <p> - Offline checkouts can be shown in the CDO Server Browser: <p align="center"><img src="server-browser.png"></p> + Offline checkouts can be shown in the CDO Server Browser: <p align="center"><img src="server-browser.png"> <p> The CDO Server Browser allows to introspect the internal data of the locally replicated repository @@ -364,12 +364,12 @@ function windowTitle() <h3><a name="Doc_CheckoutShowInProperties"></a>9.4 Showing Checkouts in the Properties View</h3> <p> - All checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_PropertySheetIntegration" title="Chapter in CDO Model Repository Documentation">Properties view</a>: <p align="center"><img src="property-sheet.png"></p> + All checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_PropertySheetIntegration" title="Chapter in CDO Model Repository Documentation">Properties view</a>: <p align="center"><img src="property-sheet.png"> <h3><a name="Doc_CheckoutShowInHistory"></a>9.5 Showing Checkouts in the History View</h3> <p> - All checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_HistoryIntegration" title="Chapter in CDO Model Repository Documentation">History view</a>: <p align="center"><img src="history.png"></p> + All checkouts can be shown in the <a href="Doc01_UserInterface.html#Doc_HistoryIntegration" title="Chapter in CDO Model Repository Documentation">History view</a>: <p align="center"><img src="history.png"> <p> This is particularly useful if the "Link with Editor and Selection" button in the toolbar of the History view @@ -377,7 +377,7 @@ function windowTitle() <h3><a name="Doc_CheckoutShowInSystemExplorer"></a>9.6 Showing Checkouts in the System Explorer</h3> <p> - All checkouts can be shown in the System Explorer: <p align="center"><img src="system-explorer-checkout.png"></p> + All checkouts can be shown in the System Explorer: <p align="center"><img src="system-explorer-checkout.png"> <p> Each checkout owns a dedicated directory under .metadata of the current workspace. This directory contains @@ -415,12 +415,12 @@ function windowTitle() To update an offline checkout from remote the checkout is selected and the Update action chosen from its context menu. The update process tries to merge all trivial conflicts they may arise. Trivial conflicts are: <ul> - <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element. - <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element. + <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element. + <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element. </ul> <p> - If non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.11/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides of the - same model element, an EMF Merge editor is opened: <p align="center"><img src="merge.png"></p> + If non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides of the + same model element, an EMF Merge editor is opened: <p align="center"><img src="merge.png"> <p> The left side of the merge editor shows the remote repository and the right side shows the selected offline checkout. @@ -444,7 +444,7 @@ function windowTitle() Checking in does not strictly require the local offline checkout to be up-to-date as long as the local changes and the remote changes are not conflicting (i.e., neither trivial nor non-trivial conflicts exist). If conflicts are detected during the check-in process the following - dialog pops up, asking to <a href="Doc05_UsingCheckouts.html#Doc_OfflineUpdate" title="Chapter in CDO Model Repository Documentation">update</a> the checkout first: <p align="center"><img src="checkin-error.png"></p> + dialog pops up, asking to <a href="Doc05_UsingCheckouts.html#Doc_OfflineUpdate" title="Chapter in CDO Model Repository Documentation">update</a> the checkout first: <p align="center"><img src="checkin-error.png"> <p> Checking in an offline checkout is a <b>remote operation</b>. @@ -455,14 +455,15 @@ function windowTitle() effectively reverting the checkout to the most recently <a href="Doc05_UsingCheckouts.html#Doc_OfflineUpdate" title="Chapter in CDO Model Repository Documentation">updated</a> state. <p> To revert an offline checkout the checkout is selected and the Revert action chosen from its context menu. - The following confirmation dialog will pop up: <p align="center"><img src="revert.png"></p> + The following confirmation dialog will pop up: <p align="center"><img src="revert.png"> <p> Reverting an offline checkout is a <b>local operation</b>. <p align="right"> <a href="Doc04_CheckingOut.html" title="Backward to Checking Out from Repositories"><img src="../../images/backward.png" border="0"></a> <a href="Doc06_UsingResources.html" title="Forward to Working with Folders and Resources"><img src="../../images/forward.png" border="0"></a></p> -<HR> -<i>Copyright (c) 2011, 2012, 2015 Eike Stepper (Berlin, Germany) and others.</i> -</BODY> -</HTML> +<!-- <div class="help_breadcrumbs breadcrumbs_bottom"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a> > <a href="index.html" title="Category in CDO Model Repository Documentation">User's Guide</a></div> --> + +<div class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html</div> +</body> +</html> |