Examples of MergeOperation

Examples of org.eclipse.egit.core.op.MergeOperation

63
64
65
66
67
68
69
70
71
72
73
74
    super.tearDown();
  }

  @Test
  public void testMergeFF() throws Exception {
    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(secondCommit));
    assertEquals(2, countCommitsInHead());
  }
View Full Code Here

Examples of org.eclipse.egit.core.op.MergeOperation

75
76
77
78
79
80
81
82
83
84
85
  @Test
  public void testMergeoptionsNoFF() throws Exception {
    setMergeOptions("side", FastForwardMode.NO_FF);

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertEquals(3, countCommitsInHead());
  }
View Full Code Here

Examples of org.eclipse.egit.core.op.MergeOperation

90
91
92
93
94
95
96
97
98
99
100
    File file2 = testRepository.createFile(project.getProject(), "file2");
    testRepository.appendFileContent(file2, "file2-1");
    RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
        "side commit 1");

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
  }
View Full Code Here

Examples of org.eclipse.egit.core.op.MergeOperation

109
110
111
112
113
114
115
116
117
118
119
  @Test
  public void testMergeNoFF() throws Exception {
    setMerge(FastForwardMode.NO_FF);

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertEquals(3, countCommitsInHead());
  }
View Full Code Here

Examples of org.eclipse.egit.core.op.MergeOperation

124
125
126
127
128
129
130
131
132
133
134
    File file2 = testRepository.createFile(project.getProject(), "file2");
    testRepository.appendFileContent(file2, "file2-1");
    RevCommit commit = testRepository.addAndCommit(project.getProject(), file2,
        "side commit 1");

    MergeOperation operation = new MergeOperation(
        testRepository.getRepository(), MASTER);
    operation.execute(new NullProgressMonitor());

    assertTrue(testRepository.getRepository().resolve(SIDE).equals(commit));
  }
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.