/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/ |
H A D | CVSMergeSubscriberTest.java | 118 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testIncomingChanges() 222 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testMergableConflicts() 223 SyncInfo.CONFLICTING | SyncInfo.CHANGE}); in testMergableConflicts() 277 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUnmergableConflicts() 279 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUnmergableConflicts() 294 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUnmergableConflicts() 296 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUnmergableConflicts() 531 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testMarkAsMerged() 591 SyncInfo.CONFLICTING | SyncInfo.CHANGE in testDeletedAddition() 635 SyncInfo.CONFLICTING | SyncInfo.CHANGE in testFileAddedToBranch() [all …]
|
H A D | CVSWorkspaceSubscriberTest.java | 508 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testOverideAndUpdateSimple() 644 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testFileConflict() 789 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 790 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 791 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 837 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 838 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 839 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testDeletionConflicts() 1259 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUpdateBinaryConflict() 1267 SyncInfo.CONFLICTING | SyncInfo.CHANGE, in testUpdateBinaryConflict() [all …]
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ |
H A D | SyncInfo.java | 117 public static final int CONFLICTING = 12; field in SyncInfo 122 public static final int DIRECTION_MASK = CONFLICTING; 373 case CONFLICTING: label = Messages.RemoteSyncElement_conflicting; break; in kindToString() 431 description = CONFLICTING | ADDITION; in calculateKind() 440 description = CONFLICTING | DELETION | PSEUDO_CONFLICT; in calculateKind() 445 description = CONFLICTING | CHANGE; in calculateKind() 452 description = CONFLICTING | CHANGE; in calculateKind() 464 description = CONFLICTING | CHANGE; in calculateKind()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ |
H A D | SubscriberParticipantPage.java | 41 …private final static int[] INCOMING_MODE_FILTER = new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMI… 42 …private final static int[] OUTGOING_MODE_FILTER = new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOI… 43 …private final static int[] BOTH_MODE_FILTER = new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMING, … 44 private final static int[] CONFLICTING_MODE_FILTER = new int[] {SyncInfo.CONFLICTING};
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/ |
H A D | IThreeWayDiff.java | 60 public static final int CONFLICTING = OUTGOING | INCOMING; field 65 public static final int DIRECTION_MASK = CONFLICTING;
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ |
H A D | SyncInfoToDiffConverter.java | 72 case IThreeWayDiff.CONFLICTING: return Messages.RemoteSyncElement_conflicting; in diffDirectionToString() 112 case SyncInfo.CONFLICTING: in asDiffFlags() 113 diffFlags |= IThreeWayDiff.CONFLICTING; in asDiffFlags() 143 case IThreeWayDiff.CONFLICTING: in asSyncInfoKind() 144 syncKind |= SyncInfo.CONFLICTING; in asSyncInfoKind() 181 if (direction == SyncInfo.INCOMING || direction == SyncInfo.CONFLICTING) { in getRemoteDelta() 220 if (direction == SyncInfo.OUTGOING || direction == SyncInfo.CONFLICTING) { in getLocalDelta()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/ |
H A D | Differencer.java | 100 public static final int CONFLICTING= 12; field in Differencer 357 description= CONFLICTING | ADDITION; in compare() 365 description= CONFLICTING | DELETION | PSEUDO_CONFLICT; in compare() 370 description= CONFLICTING | CHANGE; in compare() 377 description= CONFLICTING | CHANGE; in compare() 389 description= CONFLICTING | CHANGE; in compare()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ |
H A D | ResourceMarkAsMergedHandler.java | 90 if (twd.getDirection() == IThreeWayDiff.CONFLICTING in getOperation() 120 …&& getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIR… in updateEnablement() 121 …|| (getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DI… in updateEnablement()
|
H A D | DiffTreeStatusLineContributionGroup.java | 61 case SyncInfo.CONFLICTING: in countFor() 62 state = IThreeWayDiff.CONFLICTING; in countFor()
|
H A D | MergeAllActionHandler.java | 76 || event.getTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) > 0); in diffsChanged() 159 ….INCOMING, IThreeWayDiff.DIRECTION_MASK) + tree.countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.… in promptToUpdate()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/ |
H A D | CompareConfiguration.java | 97 …fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr1… 98 …fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr1… 99 …fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/… 113 …fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor(… 114 …fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor(… 115 …fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("o…
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ |
H A D | ModelParticipantAction.java | 119 …if (twd.getDirection() == IThreeWayDiff.CONFLICTING || twd.getDirection() == IThreeWayDiff.INCOMIN… in isVisible() 124 …if (twd.getDirection() == IThreeWayDiff.CONFLICTING || twd.getDirection() == IThreeWayDiff.OUTGOIN… in isVisible() 129 if (twd.getDirection() == IThreeWayDiff.CONFLICTING) { in isVisible()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.jdt.ui/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/ui/refactoring/model/ |
H A D | AbstractSynchronizationLabelProvider.java | 92 return IThreeWayDiff.CONFLICTING; in getDirection() 100 return IThreeWayDiff.CONFLICTING; in getDirection()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ |
H A D | SafeUpdateOperation.java | 251 case SyncInfo.CONFLICTING: in safeUpdate() 310 FastSyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.ADDITION), in getKnownFailureCases() 321 FastSyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.CHANGE), in getKnownFailureCases() 341 FastSyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.CHANGE), in getKnownFailureCases() 360 FastSyncInfoFilter.getDirectionAndChangeFilter(SyncInfo.CONFLICTING, SyncInfo.CHANGE), in getKnownFailureCases()
|
H A D | OverrideAndUpdateAction.java | 36 return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING}); in getSyncInfoFilter()
|
H A D | ConfirmMergedAction.java | 31 return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING}); in getSyncInfoFilter()
|
H A D | OverrideAndCommitAction.java | 31 return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMING}); in getSyncInfoFilter()
|
H A D | RefreshDirtyStateAction.java | 36 new SyncInfoDirectionFilter(new int[] {SyncInfo.OUTGOING, SyncInfo.CONFLICTING }), in getSyncInfoFilter()
|
H A D | MergeUpdateAction.java | 43 new SyncInfoDirectionFilter(SyncInfo.CONFLICTING) in getSyncInfoFilter()
|
H A D | CreatePatchAction.java | 37 return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING}); in getSyncInfoFilter()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ |
H A D | SyncInfoSetTraveralContext.java | 95 return direction == SyncInfo.INCOMING || direction == SyncInfo.CONFLICTING; in hasRemoteChange() 102 return direction == SyncInfo.OUTGOING || direction == SyncInfo.CONFLICTING; in hasLocalChange()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ |
H A D | ModelMerger.java | 174 || twd.getDirection() == IThreeWayDiff.CONFLICTING) { in mergeModelElement() 178 if (twd.getDirection() == IThreeWayDiff.CONFLICTING) { in mergeModelElement() 251 …rn twd.getDirection() == IThreeWayDiff.OUTGOING || twd.getDirection() == IThreeWayDiff.CONFLICTING; in hasOutgoingChanges()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ |
H A D | CVSSyncInfo.java | 92 folderKind = SyncInfo.CONFLICTING | SyncInfo.ADDITION; in calculateKind() 135 if(kind == (SyncInfo.CONFLICTING | SyncInfo.DELETION | SyncInfo.PSEUDO_CONFLICT)) { in handleDeletionConflicts() 146 return SyncInfo.CONFLICTING | SyncInfo.DELETION; in handleDeletionConflicts()
|
H A D | CVSMergeSyncInfo.java | 32 if(kind == (SyncInfo.CONFLICTING | SyncInfo.DELETION | SyncInfo.PSEUDO_CONFLICT)) { in handleDeletionConflicts()
|
/dports/java/eclipse/eclipse.platform.releng.aggregator-R4_16/eclipse.platform.team/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ |
H A D | CacheRemoteContentsOperation.java | 46 return direction == IThreeWayDiff.CONFLICTING || in isEnabledForDirection()
|