Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-05 01:33:22 -0400
committerEike Stepper2016-10-05 01:33:22 -0400
commit95d11d623b78209da114873fe169995fee7af59c (patch)
tree7f214e0b0a42ef63cd22cf83d167b30f3277ed98 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages
parent023a17a1a415b2c6272ff1a81f54c0b6f7b4e51a (diff)
downloadcdo-95d11d623b78209da114873fe169995fee7af59c.tar.gz
cdo-95d11d623b78209da114873fe169995fee7af59c.tar.xz
cdo-95d11d623b78209da114873fe169995fee7af59c.zip
[504014] Make merge information available in CDOCommitInfo
https://bugs.eclipse.org/bugs/show_bug.cgi?id=504014
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties18
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
index ef9c3e0637..614542e052 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties
@@ -89,10 +89,17 @@ ObjectNotFoundException.0=Object {0} not found
ObjectNotFoundException.1=Object {0} not found in branch {1} at {2}
InvalidObjectException.0=Object {0} is invalid in branch {1} at {2}
InvalidURIException.0=Invalid URI "{0}": {1}
+SyncRevisionsRequest.2=Did not expect to receive object with id {0}
OpenSessionRequest.0=Repository {0} not found
OpenSessionRequest.3=Failed to open session for repository {0}
-SyncRevisionsRequest.2=Did not expect to receive object with id {0}
SessionPropertyTester_0=ID
+SessionPropertyTester_3=The ID of this session.
+SessionPropertyTester_4=User
+SessionPropertyTester_5=The ID of the authenticated user of this session.
+SessionPropertyTester_6=Passive Updates Enabled
+SessionPropertyTester_7=Whether this session is receiving passive updates from the repository.
+SessionPropertyTester_8=Passive Updates Mode
+SessionPropertyTester_9=One of INVALIDATIONS, CHANGES, ADDITIONS.
SessionPropertyTester_10=Name
SessionPropertyTester_11=The name of the repository of this session.
SessionPropertyTester_12=UUID
@@ -125,10 +132,5 @@ SessionPropertyTester_38=Serialize Commits
SessionPropertyTester_39=Whether the repository of this session is serializing commits.
SessionPropertyTester_40=Authenticating
SessionPropertyTester_41=Whether the repository of this session is authenticating users.
-SessionPropertyTester_3=The ID of this session.
-SessionPropertyTester_4=User
-SessionPropertyTester_5=The ID of the authenticated user of this session.
-SessionPropertyTester_6=Passive Updates Enabled
-SessionPropertyTester_7=Whether this session is receiving passive updates from the repository.
-SessionPropertyTester_8=Passive Updates Mode
-SessionPropertyTester_9=One of INVALIDATIONS, CHANGES, ADDITIONS.
+SessionPropertyTester_42=Commit Info Storage
+SessionPropertyTester_43=One of NO, YES, WITH_MERGE_SOURCE.

Back to the top