private PullResult pull(final GeogigTransaction context, final Remote remote) throws MergeConflictsException { String fetchSpec = remote.getFetchSpec(); PullResult pullResult = context.command(PullOp.class)// .setAll(false)// .setIncludeIndexes(true)// .setRemote(remote)// .addRefSpec(fetchSpec)// .setNoFastForward(true)// .setMessage(message)// .setProgressListener(getProgressListener())// .call(); return pullResult; }
pull.setAll(all).setRebase(rebase).setFullDepth(fulldepth); pull.setDepth(depth); pull.setIncludeIndexes(withIndexes);
pull.setAll(all).setRebase(rebase).setFullDepth(fulldepth); pull.setDepth(depth); pull.setIncludeIndexes(withIndexes);
PullResult pres = context.command(PullOp.class).setIncludeIndexes(true) .addRefSpec("master").call(); fail("Expected MergeConflictsException , got " + pres);