Package org.eclipse.team.core.mapping

Examples of org.eclipse.team.core.mapping.IResourceMappingMerger.merge()

235
236
237
238
239
240
241
242
243
244
245
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
    assertContentEquals(iFile1, branchChanges + initialContent1
        + masterChanges);
    assertContentEquals(iFile2, branchChanges + initialContent2
View Full Code Here
340
341
342
343
344
345
346
347
348
349
350
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
        new NullProgressMonitor());
    assertEquals(IStatus.ERROR, mergeStatus.getSeverity());

    assertTrue(mergeStatus instanceof IMergeStatus);
    assertEquals(2,
View Full Code Here
412
413
414
415
416
417
418
419
420
421
422
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
        SAMPLE_PROVIDER_ID);
    IStatus mergeStatus = merger.merge(mergeContext,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
    assertContentEquals(iFile1, branchChanges + initialContent1
        + masterChanges);
    assertFalse(iFile2.exists());
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.