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

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

1 files changed, 16 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java
index 1607ae895a..3a845d5169 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransactionCommentator.java
@@ -54,7 +54,7 @@ public class CDOTransactionCommentator implements Closeable
         String commitComment = transaction.getCommitComment();
         if (commitComment != null)
         {
-          transaction.setCommitComment(commitComment + " " + lastComment);
+          transaction.setCommitComment(commitComment + " (" + lastComment + ")");
         }
         else
         {
@@ -186,10 +186,22 @@ public class CDOTransactionCommentator implements Closeable
   {
     if (mergeSource != null)
     {
-      builder.append(MERGE_PREFIX);
-      builder.append(mergeSource.getBranch().getPathName());
+      return appendBranchPoint(builder, mergeSource);
+    }
+
+    return false;
+  }
+
+  /**
+   * @since 4.15
+   */
+  public static boolean appendBranchPoint(StringBuilder builder, CDOBranchPoint branchPoint)
+  {
+    if (branchPoint != null)
+    {
+      builder.append(branchPoint.getBranch().getPathName());
       builder.append(", ");
-      builder.append(CDOCommonUtil.formatTimeStamp(mergeSource.getTimeStamp()));
+      builder.append(CDOCommonUtil.formatTimeStamp(branchPoint.getTimeStamp()));
       return true;
     }