diff options
| author | Eike Stepper | 2015-09-12 07:14:49 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-09-12 07:14:49 +0000 |
| commit | 0473b85e5ffc6ce88f5fd597846be755a4761095 (patch) | |
| tree | 299532fb7e05baf6699cba830227924ea2eac125 | |
| parent | c09677fa7340914aa84f06067c02331e0134ca97 (diff) | |
| download | cdo-0473b85e5ffc6ce88f5fd597846be755a4761095.tar.gz cdo-0473b85e5ffc6ce88f5fd597846be755a4761095.tar.xz cdo-0473b85e5ffc6ce88f5fd597846be755a4761095.zip | |
477128: Support interactive merging in CDOWorkspace.update()
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=477128
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java index 2431874930..c62293d35f 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java +++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java @@ -693,7 +693,7 @@ public class CDOWorkspaceImpl extends Notifier implements InternalCDOWorkspace } localRevision = remoteRevision.copy(); - localRevision.setBranchPoint(localSessionHead); + localRevision.setBranchPoint(localRepositoryHead); accessor.rawStore(localRevision, new Monitor()); } |