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 f4fdf66cc3fc6ad4d4e8e42031a4cbe10ad38510 (commit)
via 1a7d7568c7699b02a944c5ac62c637f1f85017e9 (commit)
from ac7fc9579e8ab4af50bf6c80151e8989cf31fb81 (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 f4fdf66cc3fc6ad4d4e8e42031a4cbe10ad38510
Author: Eike Stepper <[email protected]>
Date: Tue Mar 19 13:26:54 2013 +0100
[402367] CommitHistoryComposite should allow to compare two historic
states
https://bugs.eclipse.org/bugs/show_bug.cgi?id=402367
commit 1a7d7568c7699b02a944c5ac62c637f1f85017e9
Author: Eike Stepper <[email protected]>
Date: Tue Mar 19 12:35:48 2013 +0100
[400926] Move plugins that depends on EMF Compare to an independent and
optional feature
https://bugs.eclipse.org/bugs/show_bug.cgi?id=400926
-----------------------------------------------------------------------
Summary of changes:
features/org.eclipse.emf.cdo-feature/feature.xml | 14 ---
.../org.eclipse.emf.cdo.compare-feature/.project | 27 +++++
.../org.eclipse.ltk.core.refactoring.prefs | 0
.../.settings/org.eclipse.mylyn.tasks.ui.prefs | 0
.../.settings/org.eclipse.mylyn.team.ui.prefs | 0
.../build.properties | 0
.../feature.properties | 8 ++
.../feature.xml | 51 ++++++++++
.../.settings/org.eclipse.core.resources.prefs | 0
.../org.eclipse.emf.cdo.sdk-feature/feature.xml | 4 +
.../org.eclipse.emf.cdo.site-feature/feature.xml | 4 +
.../cdo/common/commit/CDOCommitInfoManager.java | 6 +
.../common/commit/CDOCommitInfoManagerImpl.java | 14 +++
.../commit/InternalCDOCommitInfoManager.java | 6 +
.../cdo/internal/net4j/CDONet4jSessionImpl.java | 1 +
.../emf/cdo/internal/server/Repository.java | 1 +
plugins/org.eclipse.emf.cdo.ui.compare/plugin.xml | 31 +++++-
.../emf/cdo/ui/compare/CDOCompareEditorUtil.java | 46 +++++++++
.../cdo/ui/internal/compare/AbstractAction.java | 101 ++++++++++++++++++++
.../compare/CompareWithEachOtherAction.java | 40 ++++++++
.../compare/CompareWithPreviousVersionAction.java | 39 ++++++++
.../emf/cdo/ui/internal/compare/MergeAction.java | 47 +++-------
.../META-INF/MANIFEST.MF | 1 -
.../ui/internal/team/history/CDOHistoryPage.java | 41 ++------
.../emf/cdo/ui/widgets/CommitHistoryComposite.java | 2 +-
25 files changed, 400 insertions(+), 84 deletions(-)
create mode 100644 features/org.eclipse.emf.cdo.compare-feature/.project
copy features/{org.eclipse.emf.cdo-feature =>
org.eclipse.emf.cdo.compare-feature}/.settings/org.eclipse.ltk.core.refactoring.prefs
(100%)
copy features/{org.eclipse.emf.cdo-feature =>
org.eclipse.emf.cdo.compare-feature}/.settings/org.eclipse.mylyn.tasks.ui.prefs
(100%)
copy features/{org.eclipse.emf.cdo-feature =>
org.eclipse.emf.cdo.compare-feature}/.settings/org.eclipse.mylyn.team.ui.prefs
(100%)
copy features/{org.eclipse.emf.cdo-feature =>
org.eclipse.emf.cdo.compare-feature}/build.properties (100%)
create mode 100644
features/org.eclipse.emf.cdo.compare-feature/feature.properties
create mode 100644 features/org.eclipse.emf.cdo.compare-feature/feature.xml
copy features/{org.eclipse.emf.cdo.site-feature =>
org.eclipse.emf.cdo.sdk-feature}/.settings/org.eclipse.core.resources.prefs
(100%)
create mode 100644
plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/AbstractAction.java
create mode 100644
plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareWithEachOtherAction.java
create mode 100644
plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/CompareWithPreviousVersionAction.java
hooks/post-receive
--
CDO Model Repository
_______________________________________________
cdo-commit mailing list
[email protected]
http://dev.eclipse.org/mailman/listinfo/cdo-commit
