|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
public interface ESMergeObserver
Callback that is called during the merge process.
The life-cycle of the merging process can be divided into three steps:
Method Summary | |
---|---|
void |
postApplyMergedChanges(ESLocalProject project,
ESChangePackage changePackage)
Called after the merge result has been re-applied, i.e. |
void |
postApplyTheirChanges(ESLocalProject project,
List<ESChangePackage> theirChangePackages)
Called after incoming changes have been applied upon the ESLocalProject and before
our changes are re-applied. |
void |
postRevertMyChanges(ESLocalProject project)
Called after local changes have been reverted and before incoming changes are applied. |
void |
preRevertMyChanges(ESLocalProject project,
ESChangePackage changePackage)
Called before all local changes are reverted. |
Method Detail |
---|
void preRevertMyChanges(ESLocalProject project, ESChangePackage changePackage)
project
- the ESLocalProject
upon which local changes have been revertedchangePackage
- the ESChangePackage
containing the operations being revertedvoid postRevertMyChanges(ESLocalProject project)
project
- the ESLocalProject
upon which local changes have been revertedvoid postApplyTheirChanges(ESLocalProject project, List<ESChangePackage> theirChangePackages)
ESLocalProject
and before
our changes are re-applied.
project
- the ESLocalProject
upon which local changes have been revertedtheirChangePackages
- a list of ESChangePackage
s containing the changes that have been applied
upon the projectvoid postApplyMergedChanges(ESLocalProject project, ESChangePackage changePackage)
project
- the ESLocalProject
upon which changes should have been re-appliedchangePackage
- the ESChangePackage
containing the changes to be applied upon the project
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |