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/Specifications/AllNonConflictingActions"
(→All Non-Conflicting Actions) |
(→All Non-Conflicting Actions) |
||
| Line 104: | Line 104: | ||
The following table shows the state the model should be after clicking on EMF Compare comparison editor toolbar's buttons: | The following table shows the state the model should be after clicking on EMF Compare comparison editor toolbar's buttons: | ||
| + | (the red cells shows differences between what is and what it should be) | ||
{| border="1" cellpadding="10" cellspacing="0" align="center" | {| border="1" cellpadding="10" cellspacing="0" align="center" | ||
| Line 131: | Line 132: | ||
|RIGHT = / | |RIGHT = / | ||
|DO NOTHING | |DO NOTHING | ||
| − | |MARK AS MERGED | + | |style="color:red"|MARK AS MERGED |
| − | |LEFT = X | + | |style="color:red"|LEFT = X |
|- align="center" | |- align="center" | ||
| | | | ||
| Line 146: | Line 147: | ||
|LEFT = / | |LEFT = / | ||
|LEFT = / | |LEFT = / | ||
| − | |MARK AS MERGED | + | |style="color:red"|MARK AS MERGED |
|- align="center" | |- align="center" | ||
| | | | ||
| Line 159: | Line 160: | ||
|RIGHT = / | |RIGHT = / | ||
|DO NOTHING | |DO NOTHING | ||
| − | |MARK AS MERGED | + | |style="color:red"|MARK AS MERGED |
| − | |LEFT = / | + | |style="color:red"|LEFT = / |
|- align="center" | |- align="center" | ||
| | | | ||
| Line 174: | Line 175: | ||
|LEFT = X | |LEFT = X | ||
|LEFT = X | |LEFT = X | ||
| − | |MARK AS MERGED | + | |style="color:red"|MARK AS MERGED |
|- align="center" | |- align="center" | ||
|2-way | |2-way | ||
Revision as of 12:17, 20 May 2015
All Non-Conflicting Actions
The following table shows the actual state of a model after clicking on EMF Compare comparison editor toolbar's buttons:
| What is | CHANGE | ANCESTOR | LEFT | RIGHT | LEFT to RIGHT | RIGHT to LEFT | ACCEPT | REJECT | ALL LEFT to RIGHT | ALL RIGHT to LEFT | ACCEPT ALL | REJECT ALL |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 3-way | Left delete | X | / | X | RIGHT = / | LEFT = X | MARK AS MERGED | LEFT = X | RIGHT = / | DO NOTHING | DO NOTHING | DO NOTHING |
| Right delete | X | X | / | RIGHT = X | LEFT = / | LEFT = / | MARK AS MERGED | DO NOTHING | LEFT = / | LEFT = / | LEFT = / | |
| Left Add | / | X | / | RIGHT = X | LEFT = / | MARK AS MERGED | LEFT = / | RIGHT = / | DO NOTHING | DO NOTHING | DO NOTHING | |
| Right Add | / | / | X | RIGHT = / | LEFT = X | LEFT = X | MARK AS MERGED | DO NOTHING | LEFT = X | LEFT = X | LEFT = X | |
| 2-way | Delete | / | X | RIGHT = / | LEFT = X | NOT TESTED | NOT TESTED | RIGHT = - | LEFT = X | NOT TESTED | NOT TESTED | |
| Add | X | / | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED |
The following table shows the state the model should be after clicking on EMF Compare comparison editor toolbar's buttons: (the red cells shows differences between what is and what it should be)
| What it should be | CHANGE | ANCESTOR | LEFT | RIGHT | LEFT to RIGHT | RIGHT to LEFT | ACCEPT | REJECT | ALL LEFT to RIGHT | ALL RIGHT to LEFT | ACCEPT ALL | REJECT ALL |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 3-way | Left delete | X | / | X | RIGHT = / | LEFT = X | MARK AS MERGED | LEFT = X | RIGHT = / | DO NOTHING | MARK AS MERGED | LEFT = X |
| Right delete | X | X | / | RIGHT = X | LEFT = / | LEFT = / | MARK AS MERGED | DO NOTHING | LEFT = / | LEFT = / | MARK AS MERGED | |
| Left Add | / | X | / | RIGHT = X | LEFT = / | MARK AS MERGED | LEFT = / | RIGHT = / | DO NOTHING | MARK AS MERGED | LEFT = / | |
| Right Add | / | / | X | RIGHT = / | LEFT = X | LEFT = X | MAM | DO NOTHING | LEFT = X | LEFT = X | MARK AS MERGED | |
| 2-way | Delete | / | X | RIGHT = / | LEFT = X | NOT TESTED | NOT TESTED | RIGHT = - | LEFT = X | NOT TESTED | NOT TESTED | |
| Add | X | / | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED |