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) |
(→Which Actions Call EMF Compare ?) |
||
(11 intermediate revisions by the same user not shown) | |||
Line 14: | Line 14: | ||
*Open a model, then in the Editor, Replace With > Local History | *Open a model, then in the Editor, Replace With > Local History | ||
** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/localhistory/ts011_tc004_localhistory_editor_replace_with.test | ** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/localhistory/ts011_tc004_localhistory_editor_replace_with.test | ||
+ | *Open a model, then in the Editor, select two EObjects and Compare With > Each Other <EObject> (in Dialog) | ||
+ | ** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/2-way/ts001_tc005_2-way_compare_with_eobject_in_dialog.test | ||
+ | *Open a model, then in the Editor, select two EObjects and Compare With > Each Other <EObject> (in Editor) | ||
+ | ** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/2-way/ts001_tc006_2-way_compare_with_eobject_in_editor.test | ||
== EGit == | == EGit == | ||
Line 23: | Line 27: | ||
*** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc002_compare_with_previous_revision.test | *** 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 | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc006_compare_with_head_revision.test | ||
**Compare With > Git index | **Compare With > Git index | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc009_compare_with_git_index.test | ||
**Compare With > Branch, tag or reference | **Compare With > Branch, tag or reference | ||
− | ** | + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc007_compare_with_branch_master.test |
− | * | + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc008_compare_with_reference.test |
− | * | + | |
− | + | ||
− | ** | + | |
*Open a model, then in the Editor, | *Open a model, then in the Editor, | ||
− | **Compare With > | + | **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 | + | **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 > | + | **Compare With > HEAD 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_tc016_compare_with_head_revision_from_editor.test |
− | ** | + | **Compare With > Git index : '''THIS CASE HAS TO BE MANAGED''' |
− | ** | + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc017_compare_with_git_index_from_editor.test |
− | ** | + | **Compare With > Branch, tag or reference : '''THIS CASE HAS TO BE MANAGED''' |
− | ** | + | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc018_compare_with_branch_master_from_editor.test |
*History View | *History View | ||
**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 | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc011_compare_with_working_tree.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 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 | *** 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 | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc012_compare_with_working_directory.test | ||
**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 | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc005_commit_viewer_compare_with_version_in_ancestor.test | ||
**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 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 | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc019_commit_viewer_compare_with_workspace.test | ||
**Select a model in the Git Repositories View, then in the History View, Compare With HEAD | **Select a model in the Git Repositories View, then in the History View, Compare With HEAD | ||
+ | *** https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/egit/ts005_tc003_git_repositories_compare_with_head.test | ||
− | + | [[Category:EMF Compare]] | |
− | [[Category:EMF Compare | + |
Latest revision as of 11:04, 14 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 : THIS CASE HAS TO BE MANAGED
- Compare With > Branch, tag or reference : THIS CASE HAS TO BE MANAGED
- 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