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.
Difference between revisions of "EMF Compare/Specifications/AllNonConflictingActions"
(→All Non-Conflicting Actions) |
|||
| (2 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
= All Non-Conflicting Actions = | = All Non-Conflicting Actions = | ||
| − | The following table shows what is currently the state of a model after clicking on EMF Compare comparison editor toolbar's buttons: | + | The following table shows what is currently the state (before https://git.eclipse.org/r/#/c/48436/) of a model after clicking on EMF Compare comparison editor toolbar's buttons: |
{| border="1" cellpadding="10" cellspacing="0" align="center" | {| border="1" cellpadding="10" cellspacing="0" align="center" | ||
| Line 55: | Line 55: | ||
|MARK AS MERGED | |MARK AS MERGED | ||
|LEFT = / | |LEFT = / | ||
| − | |RIGHT = | + | |RIGHT = X |
|DO NOTHING | |DO NOTHING | ||
|DO NOTHING | |DO NOTHING | ||
| Line 105: | Line 105: | ||
| − | The following table shows the state the model should be in after clicking on EMF Compare comparison editor toolbar's buttons: | + | The following table shows the state the model should be in (and will be after https://git.eclipse.org/r/#/c/48436/) after clicking on EMF Compare comparison editor toolbar's buttons: |
(the red cells shows differences between what is and what it should be) | (the red cells shows differences between what is and what it should be) | ||
| Line 160: | Line 160: | ||
|MARK AS MERGED | |MARK AS MERGED | ||
|LEFT = / | |LEFT = / | ||
| − | |RIGHT = | + | |RIGHT = X |
|DO NOTHING | |DO NOTHING | ||
|style="color:red"|MARK AS MERGED | |style="color:red"|MARK AS MERGED | ||
| Line 173: | Line 173: | ||
|LEFT = X | |LEFT = X | ||
|LEFT = X | |LEFT = X | ||
| − | | | + | |MARK AS MERGED |
|DO NOTHING | |DO NOTHING | ||
|LEFT = X | |LEFT = X | ||
Latest revision as of 05:24, 22 May 2015
All Non-Conflicting Actions
The following table shows what is currently the state (before https://git.eclipse.org/r/#/c/48436/) 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 = X | 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 in (and will be after https://git.eclipse.org/r/#/c/48436/) 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 = X | DO NOTHING | MARK AS MERGED | LEFT = / | |
| Right Add | / | / | X | RIGHT = / | LEFT = X | LEFT = X | MARK AS MERGED | 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 |