This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CDO Model Repository".
The branch, master has been updated
via 1237dbf76875a4c467c4701f7288431c86cdfd29 (commit)
via 5794c870bd7746b6bd35014804599c0f6da961ec (commit)
via 0739f1f0d2655e39849c3e52d9bdc2b93fd3493d (commit)
from 46cc0cd49d56378fc2a42c34a0da5fc2c5cb1b21 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1237dbf76875a4c467c4701f7288431c86cdfd29
Author: Eike Stepper <[email protected]>
Date: Tue Dec 18 11:21:04 2012 +0100
[396819] CommitHistoryComposite does not call commitInfoChanged()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396819
commit 5794c870bd7746b6bd35014804599c0f6da961ec
Author: Eike Stepper <[email protected]>
Date: Tue Dec 18 11:18:52 2012 +0100
[396818] Add EMF Compare merge support
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396818
commit 0739f1f0d2655e39849c3e52d9bdc2b93fd3493d
Author: Eike Stepper <[email protected]>
Date: Mon Dec 17 12:18:28 2012 +0100
Remove unused action field
-----------------------------------------------------------------------
Summary of changes:
.../org/eclipse/emf/cdo/common/model/EMFUtil.java | 10 +
.../eclipse/emf/cdo/compare/CDOCompareUtil.java | 607 +++-----------------
.../org/eclipse/emf/cdo/compare/CDOComparison.java | 64 --
.../emf/cdo/compare/CDOComparisonScope.java | 11 +-
.../emf/cdo/compare/CloseableComparison.java | 23 -
.../emf/cdo/compare/ComparisonScopeAdapter.java | 38 ++
.../emf/cdo/compare/DelegatingComparison.java | 196 -------
.../META-INF/MANIFEST.MF | 2 +-
.../internal/migrator/actions/MigrateAction.java | 5 -
.../org/eclipse/emf/cdo/tests/EMFCompareTest.java | 14 +-
.../META-INF/MANIFEST.MF | 1 +
.../build.properties | 3 +-
plugins/org.eclipse.emf.cdo.ui.compare/plugin.xml | 43 ++
.../emf/cdo/ui/compare/CDOCompareEditorUtil.java | 65 ++-
.../emf/cdo/ui/internal/compare/MergeAction.java | 121 ++++
.../ui/internal/team/history/CDOHistoryPage.java | 20 +-
.../org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF | 3 +-
.../emf/cdo/ui/widgets/CommitHistoryComposite.java | 14 +
18 files changed, 369 insertions(+), 871 deletions(-)
delete mode 100644
plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOComparison.java
delete mode 100644
plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CloseableComparison.java
create mode 100644
plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/ComparisonScopeAdapter.java
delete mode 100644
plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/DelegatingComparison.java
create mode 100644 plugins/org.eclipse.emf.cdo.ui.compare/plugin.xml
create mode 100644
plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit
