protected MergeReport mergeNoFF(String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = geogig.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = geogig.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(Repository repo, String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = repo.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = repo.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(Repository repo, String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = repo.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = repo.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
protected MergeReport mergeNoFF(String branch, String mergeMessage, boolean mergeOurs) { Ref branchRef = geogig.command(RefParse.class).setName(branch).call().get(); ObjectId updatesBranchTip = branchRef.getObjectId(); MergeReport mergeReport = geogig.command(MergeOp.class)// .setMessage(mergeMessage)// .setNoFastForward(true)// .addCommit(updatesBranchTip)// .setOurs(mergeOurs)// .setTheirs(!mergeOurs)// .setProgressListener(SIMPLE_PROGRESS)// .call(); return mergeReport; }
try { MergeOp merge = geogig.command(MergeOp.class); merge.setOurs(ours).setTheirs(theirs).setNoCommit(noCommit); merge.setMessage(message).setProgressListener(progress); merge.setFastForwardOnly(fastForwardOnly).setNoFastForward(noFastForward);
try { MergeOp merge = geogig.command(MergeOp.class); merge.setOurs(ours).setTheirs(theirs).setNoCommit(noCommit); merge.setMessage(message).setProgressListener(progress); merge.setFastForwardOnly(fastForwardOnly).setNoFastForward(noFastForward);
try { MergeOp merge = geogig.command(MergeOp.class); merge.setOurs(ours).setTheirs(theirs).setNoCommit(noCommit); merge.setMessage(message).setProgressListener(progress); merge.setFastForwardOnly(fastForwardOnly).setNoFastForward(noFastForward);
geogig.command(MergeOp.class).addCommit(branch.getObjectId()).setTheirs(true).call();
geogig.command(MergeOp.class).addCommit(branch.getObjectId()).setTheirs(true).call();
@Test public void testOursAndTheirs() throws Exception { insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1ModifiedB); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("master").call(); Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get(); try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()).setTheirs(true) .setOurs(true).call(); fail(); } catch (IllegalArgumentException e) { assertTrue(true); } }
@Test public void testOursAndTheirs() throws Exception { insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1ModifiedB); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("master").call(); Ref branch = geogig.command(RefParse.class).setName("TestBranch").call().get(); try { geogig.command(MergeOp.class).addCommit(branch.getObjectId()).setTheirs(true) .setOurs(true).call(); fail(); } catch (IllegalArgumentException e) { assertTrue(true); } }