Examples of org.eclipse.jgit.api.Git.merge()

org.eclipse.jgit.api.Git.merge()
org/pub/software/scm/git/docs/git-merge.html" >Git documentation about Merge @return a {@link MergeCommand} used to collect all optional parametersand to finally execute the {@code Merge} command


    // Untracked empty directory hierarcy e/1 shall not conflict with merged
    // e/1
    FileUtils.mkdirs(new File(trash, "e/1"), true);


    MergeResult mergeRes = git.merge().setStrategy(strategy)
        .include(masterCommit).call();
    assertEquals(MergeStatus.MERGED, mergeRes.getMergeStatus());
    assertEquals(
        "[d/1, mode:100644, content:1][e, mode:100644, content:4][f/1, mode:100644, content:5]",
        indexState(CONTENT));

View Full Code Here

    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

    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);

View Full Code Here

    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);

View Full Code Here

    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


    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);

View Full Code Here

    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

    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

    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

    writeTrashFile("b", "second file content - master");
    git.add().addFilepattern("b").call();
    git.commit().setMessage("master commit").call();


    // try and merge
    MergeResult result = git.merge().include(branchCommit).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

0 1 2 3

TOP

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.