RebaseOp rebase = geogig.command(RebaseOp.class).setSkip(skip).setContinue(continueRebase) .setAbort(abort).setSquashMessage(squash); rebase.setProgressListener(cli.getProgressListener());
RebaseOp rebase = geogig.command(RebaseOp.class).setSkip(skip).setContinue(continueRebase) .setAbort(abort).setSquashMessage(squash); rebase.setProgressListener(cli.getProgressListener());
RebaseOp rebase = geogig.command(RebaseOp.class).setSkip(skip).setContinue(continueRebase) .setAbort(abort).setSquashMessage(squash); rebase.setProgressListener(cli.getProgressListener());
@Test public void testContinueSkipAndAbortWhileNotInConflictedState() throws Exception { try { geogig.command(RebaseOp.class).setContinue(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot continue")); } try { geogig.command(RebaseOp.class).setAbort(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot abort")); } try { geogig.command(RebaseOp.class).setSkip(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot skip")); } }
@Test public void testContinueSkipAndAbortWhileNotInConflictedState() throws Exception { try { geogig.command(RebaseOp.class).setContinue(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot continue")); } try { geogig.command(RebaseOp.class).setAbort(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot abort")); } try { geogig.command(RebaseOp.class).setSkip(true).call(); fail(); } catch (IllegalStateException e) { assertTrue(e.getMessage().contains("Cannot skip")); } }
geogig.command(RebaseOp.class).setContinue(true).call();
geogig.command(RebaseOp.class).setContinue(true).call();
insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();
insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();
insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();
insert(points1Merged); geogig.command(AddOp.class).call(); geogig.command(RebaseOp.class).setContinue(true).call();