Examples of rm()


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

    writeTrashFile("x", "x");
    git.add().addFilepattern("x").call();
    RevCommit id1 = git.commit().setMessage("c1").call();

    writeTrashFile("f/g", "f/g");
    git.rm().addFilepattern("x").call();
    git.add().addFilepattern("f/g").call();
    git.commit().setMessage("c2").call();
    deleteTrashFile("f/g");
    deleteTrashFile("f");
View Full Code Here

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

    git.add().addFilepattern(fname).call();
    git.commit().setMessage("modify file").call();

    // Switch branches
    git.checkout().setName("side").call();
    git.rm().addFilepattern(fname).call();
    writeTrashFile(".gitignore", fname);
    git.add().addFilepattern(".gitignore").call();
    git.commit().setMessage("delete and ignore file").call();

    writeTrashFile(fname, "Something different");
View Full Code Here

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

    git.add().addFilepattern("a.txt").addFilepattern("b.txt").call();
    RevCommit first = git.commit().setMessage("added a.txt, b.txt").call();

    // modify and delete files on the master branch
    writeTrashFile("a.txt", "master");
    git.rm().addFilepattern("b.txt").call();
    RevCommit masterCommit = git.commit()
        .setMessage("modified a.txt, deleted b.txt").setAll(true)
        .call();

    // switch back to a side branch
View Full Code Here

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

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    writeTrashFile("d/1", "1\n2\n3side");
    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:1master\n2\n3side\n]",
View Full Code Here

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

        .setName("side").call();
    writeTrashFile("d/1", "1\n2\n3side");
    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:1master\n2\n3side\n]",
        indexState(CONTENT));
View Full Code Here

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

    RevCommit initialCommit = git.commit().setMessage("initial").call();

    // create side branch and delete "a"
    createBranch(initialCommit, "refs/heads/side");
    checkoutBranch("refs/heads/side");
    git.rm().addFilepattern("a").call();
    RevCommit secondCommit = git.commit().setMessage("side").call();

    // update a on master to generate conflict
    checkoutBranch("refs/heads/master");
    writeTrashFile("a", "1\na(main)\n3\n");
View Full Code Here

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

    git.checkout().setCreateBranch(true).setStartPoint(first)
        .setName("side").call();
    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]",
View Full Code Here

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

        .setName("side").call();
    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

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

        .setName("side").call();
    writeTrashFile("d/1", "modified");
    RevCommit sideCommit = git.commit().setAll(true)
        .setMessage("modified d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();

    ThreeWayMerger resolveMerger = (ThreeWayMerger) strategy.newMerger(db,
        true);
    boolean noProblems = resolveMerger.merge(masterCommit, sideCommit);
View Full Code Here

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

    writeTrashFile("d/1", "modified");
    RevCommit sideCommit = git.commit().setAll(true)
        .setMessage("modified d/1 on side").call();

    git.rm().addFilepattern("d/1").call();
    git.rm().addFilepattern("d").call();

    ThreeWayMerger resolveMerger = (ThreeWayMerger) strategy.newMerger(db,
        true);
    boolean noProblems = resolveMerger.merge(masterCommit, sideCommit);
    assertTrue(noProblems);
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.