insertAndAdd(points1); final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idP2) .call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); final RevCommit right = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); .setRight(right).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), c1.getId());
insertAndAdd(points1); final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idP2) .call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines1); final RevCommit right = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); .setRight(right).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), c1.getId());
insertAndAdd(points1); final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines2); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL2) .call(); insertAndAdd(lines1); final RevCommit right = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); .setRight(right).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), c1.getId());
insertAndAdd(points1); final RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit for " + idP3).call(); insertAndAdd(lines2); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL2) .call(); insertAndAdd(lines1); final RevCommit right = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); .setRight(right).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), c1.getId());
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); final RevCommit ancestor = geogig.command(CommitOp.class).setMessage("commit for " + idP3) .call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch2").call(); insertAndAdd(lines1); final RevCommit branch2 = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); geogig.command(CheckoutOp.class).setSource("branch1").call(); insertAndAdd(lines3); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL3) .call(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit for " + idL2).call(); .setLeft(mergeReport.getMergeCommit()).setRight(branch2).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), ancestor.getId());
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); final RevCommit ancestor = geogig.command(CommitOp.class).setMessage("commit for " + idP3) .call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch2").call(); insertAndAdd(lines1); final RevCommit branch2 = geogig.command(CommitOp.class).setMessage("commit for " + idL1) .call(); geogig.command(CheckoutOp.class).setSource("branch1").call(); insertAndAdd(lines3); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL3) .call(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit for " + idL2).call(); .setLeft(mergeReport.getMergeCommit()).setRight(branch2).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), ancestor.getId());
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); final RevCommit ancestor = geogig.command(CommitOp.class).setMessage("commit for " + idP3) .call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch2").call(); insertAndAdd(lines1); geogig.command(CommitOp.class).setMessage("commit for " + idL1).call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch3").call(); insertAndAdd(poly1); RevCommit branch3 = geogig.command(CommitOp.class).setMessage("commit for " + idPG1).call(); geogig.command(CheckoutOp.class).setSource("branch2").call(); insertAndAdd(poly2); geogig.command(CommitOp.class).setMessage("commit for " + idPG2).call(); insertAndAdd(lines3); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL3) .call(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit for " + idL2).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), ancestor.getId());
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit for " + idP2).call(); insertAndAdd(points3); final RevCommit ancestor = geogig.command(CommitOp.class).setMessage("commit for " + idP3) .call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch2").call(); insertAndAdd(lines1); geogig.command(CommitOp.class).setMessage("commit for " + idL1).call(); geogig.command(BranchCreateOp.class).setAutoCheckout(true).setName("branch3").call(); insertAndAdd(poly1); RevCommit branch3 = geogig.command(CommitOp.class).setMessage("commit for " + idPG1).call(); geogig.command(CheckoutOp.class).setSource("branch2").call(); insertAndAdd(poly2); geogig.command(CommitOp.class).setMessage("commit for " + idPG2).call(); insertAndAdd(lines3); final RevCommit left = geogig.command(CommitOp.class).setMessage("commit for " + idL3) .call(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit for " + idL2).call(); assertTrue(commonAncestor.isPresent()); assertEquals(commonAncestor.get(), ancestor.getId());
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("root commit").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit1").call(); geogig.command(BranchCreateOp.class).setAutoCheckout(false).setName("branch2").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit2").call(); insertAndAdd(points1_modified); geogig.command(CommitOp.class).setMessage("commit3").call(); insertAndAdd(lines1); ObjectId commit4 = geogig.command(CommitOp.class).setMessage("commit4").call().getId(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit6").call(); insertAndAdd(lines3); geogig.command(CommitOp.class).setMessage("commit7").call(); insertAndAdd(poly1); geogig.command(CommitOp.class).setMessage("commit8").call(); insertAndAdd(poly2); ObjectId commit9 = geogig.command(CommitOp.class).setMessage("commit9").call().getId(); insertAndAdd(poly3);
insertAndAdd(points1); geogig.command(CommitOp.class).setMessage("root commit").call(); insertAndAdd(points2); geogig.command(CommitOp.class).setMessage("commit1").call(); geogig.command(BranchCreateOp.class).setAutoCheckout(false).setName("branch2").call(); insertAndAdd(points3); geogig.command(CommitOp.class).setMessage("commit2").call(); insertAndAdd(points1_modified); geogig.command(CommitOp.class).setMessage("commit3").call(); insertAndAdd(lines1); ObjectId commit4 = geogig.command(CommitOp.class).setMessage("commit4").call().getId(); insertAndAdd(lines2); geogig.command(CommitOp.class).setMessage("commit6").call(); insertAndAdd(lines3); geogig.command(CommitOp.class).setMessage("commit7").call(); insertAndAdd(poly1); geogig.command(CommitOp.class).setMessage("commit8").call(); insertAndAdd(poly2); ObjectId commit9 = geogig.command(CommitOp.class).setMessage("commit9").call().getId(); insertAndAdd(poly3);