Package org.eclipse.team.core.mapping

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

175
176
177
178
179
180
181
182
183
184
185
    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
285
286
287
288
289
290
291
292
293
294
295
    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
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.