Notice: This Wiki is now read only and edits are no longer 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) |
|||
| Line 18: | Line 18: | ||
*Selection of 1 model in the workspace, then | *Selection of 1 model in the workspace, then | ||
| + | **Compare With > Commit | ||
| + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc001_compare_with_commit.test | ||
| + | **Compare With > Previous revision | ||
| + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc002_compare_with_previous_revision.test | ||
**Compare With > HEAD revision | **Compare With > HEAD revision | ||
**Compare With > Git index | **Compare With > Git index | ||
| − | |||
**Compare With > Branch, tag or reference | **Compare With > Branch, tag or reference | ||
| − | |||
| − | |||
**Replace With > HEAD revision | **Replace With > HEAD revision | ||
**Replace With > Git index | **Replace With > Git index | ||
| Line 45: | Line 46: | ||
**Select a model in the workspace, then select a commit in the History View, then Compare With Workspace | **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 Version in Ancestor | ||
| + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc004_compare_with_version_in_ancestor.test | ||
**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, 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 Version in Ancestor | ||
Revision as of 05:21, 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
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
- Replace With > HEAD revision
- Replace With > Git index
- Replace With > Previous revision
- Replace With > Branch, tag or reference
- Replace With > Commit
- Open a model, then in the Editor,
- Compare With > HEAD revision
- Compare With > Git index
- Compare With > Previous revision
- Compare With > Branch, tag or reference
- Compare With > Commit
- Replace With > HEAD revision
- Replace With > Git index
- Replace With > Previous revision
- Replace With > Branch, tag or reference
- Replace With > Commit
- 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