Revision as of 09:03, 9 April 2014

Which Actions Call EMF Compare ?

Local

• Selection of 2 or 3 models in the workspace, then Compare With > Each Other
  • https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/2-way/ts001_tc001_2-way_comparison.test
  • https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/3-way/ts002_tc001_3-way_comparison.test
• Selection of 1 model in the workspace, then Compare With > Local History
  • https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/localhistory/ts011_tc001_localhistory_workspace_compare_with.test
• Selection of 1 model in the workspace, then Replace With > Local History
  • https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/localhistory/ts011_tc002_localhistory_workspace_replace_with.test
• Open a model, then in the Editor, Compare With > Local History
  • https://github.com/Obeo/emf.compare.acceptance.tests/blob/master/tests/emf.compare.q7.tests/tests/localhistory/ts011_tc003_localhistory_editor_compare_with.test
• 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
• 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

• 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
    • 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
    • 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
    • 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,
  • 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
    • 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
    • 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
    • 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
    • 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 model in the Git Repositories View, then in the History View, Compare With HEAD