Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EMF Compare/Which Actions Call EMF Compare"
(→EGit) |
(→EGit) |
||
| Line 35: | Line 35: | ||
*Open a model, then in the Editor, | *Open a model, then in the Editor, | ||
| − | **Compare With > HEAD revision | + | **Compare With > Commit : '''THIS CASE HAS TO BE MANAGED''' |
| + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc014_compare_with_commit_from_editor.test | ||
| + | **Compare With > Previous revision : '''THIS CASE HAS TO BE MANAGED''' | ||
| + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc015_compare_with_previous_revision_from_editor.test | ||
| + | **Compare With > HEAD revision : '''THIS CASE HAS TO BE MANAGED''' | ||
**Compare With > Git index | **Compare With > Git index | ||
| − | |||
**Compare With > Branch, tag or reference | **Compare With > Branch, tag or reference | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
*History View | *History View | ||
Revision as of 09:29, 9 April 2014
Which Actions Call EMF Compare ?
Local
- Selection of 2 or 3 models in the workspace, then Compare With > Each Other
- Selection of 1 model in the workspace, then Compare With > Local History
- Selection of 1 model in the workspace, then Replace With > Local History
- Open a model, then in the Editor, Compare With > Local History
- Open a model, then in the Editor, Replace With > Local History
- Open a model, then in the Editor, select two EObjects and Compare With > Each Other <EObject> (in Dialog)
- Open a model, then in the Editor, select two EObjects and Compare With > Each Other <EObject> (in Editor)
EGit
- Selection of 1 model in the workspace, then
- Compare With > Commit
- Compare With > Previous revision
- Compare With > HEAD revision
- Compare With > Git index
- Compare With > Branch, tag or reference
- Open a model, then in the Editor,
- Compare With > Commit : THIS CASE HAS TO BE MANAGED
- Compare With > Previous revision : THIS CASE HAS TO BE MANAGED
- Compare With > HEAD revision : THIS CASE HAS TO BE MANAGED
- Compare With > Git index
- Compare With > Branch, tag or reference
- History View
- Select a model in the workspace, then select a commit in the History View, then Compare With Workspace
- Select a commit in the History View that contains changes on a model, then in the list of modified files, select a model and Compare with Version in Ancestor
- Select a commit in the History View that contains changes on a model, then in the list of modified files, select a model and Compare with Workspace
- Select a commit in the History View that contains changes on a model, the select Open in Commit Viewer, then in the list of modified files, select a model and Compare with Version in Ancestor
- Select a commit in the History View that contains changes on a model, the select Open in Commit Viewer, then in the list of modified files, select a model and Compare with Workspace
- Select a model in the Git Repositories View, then in the History View, Compare With HEAD