revert.setCreateCommit(!noCommit).setAbort(abort).setContinue(continueRevert).call(); } catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder();
revert.setCreateCommit(!noCommit).setAbort(abort).setContinue(continueRevert).call(); } catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder();
revert.setCreateCommit(!noCommit).setAbort(abort).setContinue(continueRevert).call(); } catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder();
@Test public void testRevertUsingContinueAndAbort() throws Exception { insertAndAdd(points1); RevCommit commit = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); exception.expect(IllegalArgumentException.class); geogig.command(RevertOp.class).addCommit(Suppliers.ofInstance(commit.getId())) .setAbort(true).setContinue(true).call(); }
@Test public void testRevertUsingContinueAndAbort() throws Exception { insertAndAdd(points1); RevCommit commit = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); exception.expect(IllegalArgumentException.class); geogig.command(RevertOp.class).addCommit(commit.getId()).setAbort(true).setContinue(true) .call(); }
assertEquals(conflicts.get(0).getTheirs(), RevFeatureBuilder.build(points1).getId()); geogig.command(RevertOp.class).setAbort(true).call();
assertEquals(conflicts.get(0).getTheirs(), RevFeature.builder().build(points1).getId()); geogig.command(RevertOp.class).setAbort(true).call();