diff options
| author | Eike Stepper | 2010-03-05 17:38:23 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-03-05 17:38:23 +0000 |
| commit | c49f4599e2ad5378f3bf911333cfe17fba636410 (patch) | |
| tree | 2e7c3eb76e425f8f24a32d6bdd070d9235d53ee4 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java | |
| parent | 8c5c0005e5939cb8cecd5cf86fb77b685d2a34d0 (diff) | |
| download | cdo-c49f4599e2ad5378f3bf911333cfe17fba636410.tar.gz cdo-c49f4599e2ad5378f3bf911333cfe17fba636410.tar.xz cdo-c49f4599e2ad5378f3bf911333cfe17fba636410.zip | |
[256936] Support for Offline Mode
https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java index cd5a74f66c..1f002e39a4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.transaction; import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; +import org.eclipse.emf.cdo.common.commit.CDOChangeSetData; import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; @@ -477,9 +478,9 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction delegate.resolveConflicts(resolver); } - public void merge(CDOBranchPoint source, CDOMerger merger) + public CDOChangeSetData merge(CDOBranchPoint source, CDOMerger merger) { - delegate.merge(source, merger); + return delegate.merge(source, merger); } public CDOSavepoint setSavepoint() |