Skip to main content

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.

Jump to: navigation, search

Difference between revisions of "EMF Compare/Which Actions Call EMF Compare"

Line 4: Line 4:
  
 
*Selection of 2 or 3 models in the workspace, then Compare With > Each Other
 
*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
 
*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
 
*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
 
*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
 
*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
  
 
== EGit ==
 
== EGit ==

Revision as of 05:12, 9 April 2014

Which Actions Call EMF Compare ?

Local

EGit

  • Selection of 1 model in the workspace, then
    • 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
  • 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

Back to the top