Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html105
1 files changed, 93 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html
index b058e1128f..e13bcb4f42 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransaction.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<dl>
<dt>All Superinterfaces:</dt>
-<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetDataProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.Provider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.Provider</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>,<a href="../../../../../org/eclipse/emf/cdo/CDOObjectHistory.html" title="interface in org.eclipse.emf.cdo">CDOObjectHistory</a>&gt;, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/util/CDOUpdatable.html" title="interface in org.eclipse.emf.cdo.util">CDOUpdatable</a>, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOUserTransaction</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResourceNode</a>&gt;, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
+<dd><a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchProvider.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetDataProvider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetDataProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.Provider.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.Provider</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>,<a href="../../../../../org/eclipse/emf/cdo/CDOObjectHistory.html" title="interface in org.eclipse.emf.cdo">CDOObjectHistory</a>&gt;, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</a>, <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</a>, <a href="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockOwner.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockOwner</a>, <a href="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/util/CDOUpdatable.html" title="interface in org.eclipse.emf.cdo.util">CDOUpdatable</a>, <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOUserTransaction</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html?is-external=true" title="class or interface in org.eclipse.net4j.util.collection">Closeable</a>, <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/core/runtime/IAdaptable.html?is-external=true" title="class or interface in org.eclipse.core.runtime">IAdaptable</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResourceNode</a>&gt;, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">INotifier</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options">IOptionsContainer</a>, <a href="../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/IPropertiesContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.properties">IPropertiesContainer</a></dd>
</dl>
<dl>
<dt>All Known Subinterfaces:</dt>
@@ -249,7 +249,9 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
</tr>
<tr id="i10" class="altColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#getConflicts--">getConflicts</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#getConflicts--">getConflicts</a></span>()</code>
+<div class="block">Returns the set of objects that are conflicting with remote modifications or an empty set if <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#hasConflict--"><code>hasConflict()</code></a> returns <code>false</code>.</div>
+</td>
</tr>
<tr id="i11" class="rowColor">
<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;</code></td>
@@ -328,36 +330,60 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
</tr>
<tr id="i28" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source branch into this transaction and possibly considers previous merges
+ from that branch by inspecting the <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
+</tr>
+<tr id="i29" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
+</tr>
+<tr id="i30" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
- <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.</div>
+</td>
</tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" class="rowColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">merge</a></span>(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
- <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>&nbsp;</td>
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</code>
+<div class="block">Merges the changes from the given source point into this transaction and possibly considers previous merges
+ from that <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a> by inspecting the <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+</td>
</tr>
-<tr id="i30" class="altColor">
+<tr id="i32" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction.Options</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#options--">options</a></span>()</code>
<div class="block">Returns the <a href="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.Options.html" title="interface in org.eclipse.emf.cdo.common"><code>options</code></a> of this view.</div>
</td>
</tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler-org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase-">removeTransactionHandler</a></span>(<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandlerBase</a>&nbsp;handler)</code>&nbsp;</td>
</tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#setCommitComment-java.lang.String-">setCommitComment</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;comment)</code>
<div class="block">Sets the comment to be used in the next commit operation.</div>
</td>
</tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#setCommittables-java.util.Set-">setCommittables</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;? extends <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</a>&gt;&nbsp;committables)</code>&nbsp;</td>
</tr>
-<tr id="i34" class="altColor">
+<tr id="i36" class="altColor">
<td class="colFirst"><code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</a></code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#setSavepoint--">setSavepoint</a></span>()</code>
<div class="block">Creates a save point in the <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><code>CDOTransaction</code></a> that can be used to roll back a part of the transaction</div>
@@ -369,7 +395,7 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
<!-- -->
</a>
<h3>Methods inherited from interface&nbsp;org.eclipse.emf.cdo.view.<a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a></h3>
-<code><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler-org.eclipse.emf.cdo.view.CDOObjectHandler-">addObjectHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">compareRevisions</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery-java.lang.String-java.lang.String-">createQuery</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery-java.lang.String-java.lang.String-java.lang.Object-">createQuery</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createResourceURI-java.lang.String-">createResourceURI</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking-boolean-">disableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking--">enableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking-boolean-">enableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource-java.lang.String-">getBinaryResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-org.eclipse.emf.cdo.common.id.CDOID-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-org.eclipse.emf.cdo.common.id.CDOID-boolean-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-T-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers--">getObjectHandlers</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getProvider--">getProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource-java.lang.String-">getResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource-java.lang.String-boolean-">getResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceFolder-java.lang.String-">getResourceFolder</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode-java.lang.String-">getResourceNode</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet--">getResourceSet</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource--">getRootResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getSession--">getSession</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource-java.lang.String-">getTextResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getUnitManager--">getUnitManager</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler--">getURIHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getViewLock--">getViewLock</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getViewSet--">getViewSet</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource-java.lang.String-">hasResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive--">isInvalidationRunnerActive</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled--">isLegacyModeEnabled</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered-org.eclipse.emf.cdo.common.id.CDOID-">isObjectRegistered</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-boolean-">lockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryInstances-org.eclipse.emf.ecore.EClass-">queryInstances</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-">queryInstancesAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources-org.eclipse.emf.cdo.eresource.CDOResourceFolder-java.lang.String-boolean-">queryResources</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync-org.eclipse.emf.cdo.eresource.CDOResourceFolder-java.lang.String-boolean-">queryResourcesAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.ecore.EReference...-">queryXRefs</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefs</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefsAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload-org.eclipse.emf.cdo.CDOObject...-">reload</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler-org.eclipse.emf.cdo.view.CDOObjectHandler-">removeObjectHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">setBranch</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.core.runtime.IProgressMonitor-">setBranch</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranch-long-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranch-long-org.eclipse.core.runtime.IProgressMonitor-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.core.runtime.IProgressMonitor-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setResourcePathCache-java.util.Map-">setResourcePathCache</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp-long-">setTimeStamp</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp-long-org.eclipse.core.runtime.IProgressMonitor-">setTimeStamp</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#syncExec-java.util.concurrent.Callable-">syncExec</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#syncExec-java.lang.Runnable-">syncExec</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects--">unlockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-">unlockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">unlockObjects</a></code></li>
+<code><a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler-org.eclipse.emf.cdo.view.CDOObjectHandler-">addObjectHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">compareRevisions</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery-java.lang.String-java.lang.String-">createQuery</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery-java.lang.String-java.lang.String-java.lang.Object-">createQuery</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createResourceURI-java.lang.String-">createResourceURI</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking-boolean-">disableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking--">enableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking-boolean-">enableDurableLocking</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource-java.lang.String-">getBinaryResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getLockStates-java.util.Collection-">getLockStates</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getLockStatesOfObjects-java.util.Collection-">getLockStatesOfObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-org.eclipse.emf.cdo.common.id.CDOID-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-org.eclipse.emf.cdo.common.id.CDOID-boolean-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject-T-">getObject</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers--">getObjectHandlers</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getProvider--">getProvider</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource-java.lang.String-">getResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource-java.lang.String-boolean-">getResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceFolder-java.lang.String-">getResourceFolder</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode-java.lang.String-">getResourceNode</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet--">getResourceSet</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource--">getRootResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getSession--">getSession</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource-java.lang.String-">getTextResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getUnitManager--">getUnitManager</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler--">getURIHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getViewLock--">getViewLock</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getViewSet--">getViewSet</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource-java.lang.String-">hasResource</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive--">isInvalidationRunnerActive</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled--">isLegacyModeEnabled</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered-org.eclipse.emf.cdo.common.id.CDOID-">isObjectRegistered</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-boolean-">lockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryInstances-org.eclipse.emf.ecore.EClass-">queryInstances</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-">queryInstancesAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryInstancesAsync-org.eclipse.emf.ecore.EClass-boolean-">queryInstancesAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources-org.eclipse.emf.cdo.eresource.CDOResourceFolder-java.lang.String-boolean-">queryResources</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync-org.eclipse.emf.cdo.eresource.CDOResourceFolder-java.lang.String-boolean-">queryResourcesAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs-org.eclipse.emf.cdo.CDOObject-org.eclipse.emf.ecore.EReference...-">queryXRefs</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefs</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync-java.util.Set-org.eclipse.emf.ecore.EReference...-">queryXRefsAsync</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload-org.eclipse.emf.cdo.CDOObject...-">reload</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler-org.eclipse.emf.cdo.view.CDOObjectHandler-">removeObjectHandler</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-">setBranch</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.core.runtime.IProgressMonitor-">setBranch</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranch-long-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranch-long-org.eclipse.core.runtime.IProgressMonitor-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.core.runtime.IProgressMonitor-">setBranchPoint</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setResourcePathCache-java.util.Map-">setResourcePathCache</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp-long-">setTimeStamp</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp-long-org.eclipse.core.runtime.IProgressMonitor-">setTimeStamp</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#syncExec-java.util.concurrent.Callable-">syncExec</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#syncExec-java.lang.Runnable-">syncExec</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects--">unlockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-">unlockObjects</a>, <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">unlockObjects</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.emf.cdo.util.CDOUpdatable">
@@ -517,6 +543,26 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
<li class="blockList">
<h4>getConflicts</h4>
<pre><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</a>&gt;&nbsp;getConflicts()</pre>
+<div class="block">Returns the set of objects that are conflicting with remote modifications or an empty set if <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#hasConflict--"><code>hasConflict()</code></a> returns <code>false</code>.</div>
+</li>
+</ul>
+<a name="merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;merge(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>&nbsp;source,
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</pre>
+<div class="block">Merges the changes from the given source branch into this transaction and possibly considers previous merges
+ from that branch by inspecting the <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranchPoint, CDOMerger)</code></a></dd>
+</dl>
</li>
</ul>
<a name="merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">
@@ -527,6 +573,9 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
<h4>merge</h4>
<pre><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;merge(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</pre>
+<div class="block">Merges the changes from the given source point into this transaction and possibly considers previous merges
+ from that <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch--"><code>branch</code></a> by inspecting the <a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getMergeSource--"><code>merge source</code></a>
+ information of the <a href="../../../../../org/eclipse/emf/cdo/session/CDOSession.html#getCommitInfoManager--"><code>commit history</code></a>.</div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>3.0</dd>
@@ -542,12 +591,44 @@ extends <a href="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="in
<pre><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;merge(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</pre>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.
+ <p>
+ <b>Warning:</b> If the branch of this transaction already contains merges from the given source point range
+ (i.e., if this merge is a "remerge") this method will likely fail. One of the following methods should be used instead:
+ <p>
+ <ul>
+ <li> <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranchPoint, CDOBranchPoint, CDOBranchPoint, CDOMerger)</code></a>
+ <li> <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranchPoint, CDOMerger)</code></a>
+ <li> <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranch, CDOMerger)</code></a>
+ </ul></div>
<dl>
<dt><span class="simpleTagLabel">Since:</span></dt>
<dd>4.0</dd>
</dl>
</li>
</ul>
+<a name="merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre><a href="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;merge(<a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;source,
+ <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;sourceBase,
+ <a href="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a>&nbsp;targetBase,
+ <a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger)</pre>
+<div class="block">Merges the changes between the given source base point and the given source point into this transaction.
+ <p>
+ When specifying an adequate target base point this method is able to perform a proper "remerge".</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranchPoint, CDOMerger)</code></a>,
+<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#merge-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.emf.cdo.transaction.CDOMerger-"><code>merge(CDOBranch, CDOMerger)</code></a></dd>
+</dl>
+</li>
+</ul>
<a name="createResourceFolder-java.lang.String-">
<!-- -->
</a>

Back to the top