Examples of IMergeContext

Examples of org.eclipse.team.core.mapping.IMergeContext

125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
    assertTrue(status.getModified().contains(repoRelativePath));

    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());

    IMergeContext mergeContext = prepareContext(workspaceFile, HEAD, HEAD);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);
    // First of all, "markAsMerged" is not supposed to have any effect on a
    // folder.
    // Second, it should only be used on IDiff obtained from the context,
    // not created for the occasion.
    mergeContext.markAsMerged(node, true, null);

    status = new Git(repo).status().call();
    assertEquals(1, status.getChanged().size());
    assertEquals(0, status.getModified().size());
    assertTrue(status.getChanged().contains(repoRelativePath));
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext

170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
        + masterChanges, "master commit");
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
    assertContentEquals(workspaceFile, branchChanges + initialContent
        + masterChanges);
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext

227
228
229
230
231
232
233
234
235
236
237
238
239
240
        "master commit");
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext

280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
        "master commit");
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.ERROR, mergeStatus.getSeverity());
    assertContentEquals(workspaceFile, initialContent + masterChanges);

    Status status = new Git(repo).status().call();
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext

332
333
334
335
336
337
338
339
340
341
342
343
344
345
        "master commit");
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext

404
405
406
407
408
409
410
411
412
413
414
415
416
417
        "master commit");
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.