[260036] Provide "revert to the history revision" operation

https://bugs.eclipse.org/bugs/show_bug.cgi?id=260036

2 files changed, 8 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java
index 0f9fb1cf3c..3cf64404ad 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/RevertToActionProvider.java
@@ -51,7 +51,7 @@ public class RevertToActionProvider extends AbstractBranchPointActionProvider
   @Override
   protected void fillOtherCheckoutAction(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout, CDOCheckout otherCheckout)
   {
-    if (CDOBranchUtil.isContainedBy(checkout.getBranchPoint(), otherCheckout.getBranchPoint()))
+    if (CDOBranchUtil.isContainedBy(otherCheckout.getBranchPoint(), checkout.getBranchPoint()))
     {
       super.fillOtherCheckoutAction(page, subMenu, checkout, otherCheckout);
     }
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index b539a2f148..6503ee0a27 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.cdo.internal.explorer.AbstractManager;
 import org.eclipse.emf.cdo.internal.explorer.bundle.OM;
 import org.eclipse.emf.cdo.internal.explorer.repositories.CDORepositoryImpl;
 import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.util.ReadOnlyException;
@@ -196,7 +197,12 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
   @Override
   public final CDOBranchPoint getBranchPoint()
   {
-    return view;
+    if (view != null)
+    {
+      return CDOBranchUtil.copyBranchPoint(view);
+    }
+
+    return getBranchPoint(this);
   }
 
   @Override