Package org.eclipse.jgit.api

Examples of org.eclipse.jgit.api.MergeResult

287
288
289
290
291
292
293
294
295
296
297
    git.commit().setMessage("on brancha").call();

    db.getConfig().setString("core", null, "autocrlf", "input");
    db.getConfig().save();

    MergeResult mergeResult = git.merge().setStrategy(strategy)
        .include(db.resolve("master"))
        .call();
    assertEquals(MergeResult.MergeStatus.MERGED,
        mergeResult.getMergeStatus());
  }
View Full Code Here
321
322
323
324
325
326
327
328
329
330
331
    writeTrashFile("d/1", "modified");
    git.commit().setAll(true).setMessage("modified d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, mergeRes.getMergeStatus());
    assertEquals("[d/1, mode:100644, content:modified]",
        indexState(CONTENT));
  }
View Full Code Here
392
393
394
395
396
397
398
399
400
401
402
403
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, mergeRes.getMergeStatus());
    assertEquals(
        "[2, mode:100644, content:orig][d/1, mode:100644, content:orig]",
        indexState(CONTENT));
  }
View Full Code Here
429
430
431
432
433
434
435
436
437
438
439
440
    git.add().addFilepattern("d/1").call();
    git.commit().setAll(true).setMessage("added d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.CONFLICTING, mergeRes.getMergeStatus());
    assertEquals(
        "[2, mode:100644, content:orig][d/1, mode:100644, stage:2, content:side][d/1, mode:100644, stage:3, content:master]",
        indexState(CONTENT));
  }
View Full Code Here
465
466
467
468
469
470
471
472
473
    git.commit().setAll(true).setMessage("modified 0 on side").call();

    git.rm().addFilepattern("0").call();
    writeTrashFile("0/0", "side");
    git.add().addFilepattern("0/0").call();
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.FAILED, mergeRes.getMergeStatus());
  }
View Full Code Here
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
    writeTrashFile("1", "1\n2\n3side2");
    git.commit().setAll(true)
        .setMessage("modified 1 on side again").call();

    MergeResult result = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());
    result.getNewHead();
    git.checkout().setName("master").call();
    result = git.merge().setStrategy(strategy).include(sideCommit).call();
    assertEquals(MergeStatus.MERGED, result.getMergeStatus());

    // we have two branches which are criss-cross merged. Try to merge the
    // tips. This should succeed with RecursiveMerge and fail with
    // ResolveMerge
    try {
      MergeResult mergeResult = git.merge().setStrategy(strategy)
          .include(git.getRepository().getRef("refs/heads/side"))
          .call();
      assertEquals(MergeStrategy.RECURSIVE, strategy);
      assertEquals(MergeResult.MergeStatus.MERGED,
          mergeResult.getMergeStatus());
      assertEquals("1master2\n2\n3side2\n", read("1"));
    } catch (JGitInternalException e) {
      assertEquals(MergeStrategy.RESOLVE, strategy);
      assertTrue(e.getCause() instanceof NoMergeBaseException);
      assertEquals(((NoMergeBaseException) e.getCause()).getReason(),
View Full Code Here
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
    git.commit().setMessage("added c.txt").call();

    // Get a handle to the the file so on windows it can't be deleted.
    FileInputStream fis = new FileInputStream(new File(db.getWorkTree(),
        "b.txt"));
    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    if (mergeRes.getMergeStatus().equals(MergeStatus.FAILED)) {
      // probably windows
      assertEquals(1, mergeRes.getFailingPaths().size());
      assertEquals(MergeFailureReason.COULD_NOT_DELETE, mergeRes
          .getFailingPaths().get("b.txt"));
    }
    assertEquals("[a.txt, mode:100644, content:master]"
        + "[c.txt, mode:100644, content:side]", indexState(CONTENT));
    fis.close();
View Full Code Here
201
202
203
204
205
206
207
208
209
210
211
212
213
    writeTrashFile("a", "1\na(main)\n3\n");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("main").call();

    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
View Full Code Here
243
244
245
246
247
248
249
250
251
252
253
254
255
    writeTrashFile("a", "1\na(main)\n3\n");
    git.add().addFilepattern("a").call();
    git.commit().setMessage("main").call();

    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
View Full Code Here
283
284
285
286
287
288
289
290
291
292
293
294
295
    writeTrashFile("b", "1\nb(main)\n3\n");
    git.add().addFilepattern("b").call();
    git.commit().setMessage("main").call();

    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.api.MergeResult

  • com.atlassian.jgitflow.core.command.AbstractBranchMergingCommand
  • com.atlassian.jgitflow.core.command.FeatureFinishCommand
  • com.atlassian.jgitflow.core.command.HotfixFinishCommand
  • com.atlassian.jgitflow.core.command.ReleaseFinishCommand
  • com.atlassian.jgitflow.core.FeatureFinishCommand
  • com.atlassian.jgitflow.core.HotfixFinishCommand
  • com.atlassian.jgitflow.core.ReleaseFinishCommand
  • com.atlassian.maven.plugins.jgitflow.manager.DefaultFlowFeatureManager
  • com.gitblit.tests.GitServletTest
  • domain.Repo
    • Copyright © 2018 www.massapicom. 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.