diff options
| author | Eike Stepper | 2010-12-22 07:16:10 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-12-22 07:16:10 +0000 |
| commit | 46a577d9b19d68cd177122004ead41993578fdd6 (patch) | |
| tree | a58ad7a573dc546d56807c5c39699c842cc10432 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java | |
| parent | 065e077980a492d40a213fa3b063d923788bed38 (diff) | |
| download | cdo-46a577d9b19d68cd177122004ead41993578fdd6.tar.gz cdo-46a577d9b19d68cd177122004ead41993578fdd6.tar.xz cdo-46a577d9b19d68cd177122004ead41993578fdd6.zip | |
[333058] Provide ability to remerge a branch (specify source range)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=333058
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java index b2609b613c..bb1be62e97 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java @@ -71,6 +71,11 @@ public interface CDOTransaction extends CDOView, CDOUserTransaction, CDOChangeSe /** * @since 4.0 */ + public CDOChangeSetData merge(CDOBranchPoint source, CDOBranchPoint sourceBase, CDOMerger merger); + + /** + * @since 4.0 + */ public CDOResourceFolder createResourceFolder(String path); /** |