} catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder(); sb.append(e.getMessage() + "\n"); sb.append("When you have fixed these conflicts, run 'geogig revert --continue' to continue the revert operation.\n"); sb.append("To abort the revert operation, run 'geogig revert --abort'\n");
} catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder(); sb.append(e.getMessage() + "\n"); sb.append("When you have fixed these conflicts, run 'geogig revert --continue' to continue the revert operation.\n"); sb.append("To abort the revert operation, run 'geogig revert --abort'\n");
} catch (RevertConflictsException e) { StringBuilder sb = new StringBuilder(); sb.append(e.getMessage() + "\n"); sb.append("When you have fixed these conflicts, run 'geogig revert --continue' to continue the revert operation.\n"); sb.append("To abort the revert operation, run 'geogig revert --abort'\n");
@Test public void testStillDeletedMergeConflictResolution() throws Exception { insertAndAdd(points1); @SuppressWarnings("unused") RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); deleteAndAdd(points1); RevCommit c2 = geogig.command(CommitOp.class).setMessage("commit for removing " + idP1) .call(); @SuppressWarnings("unused") ObjectId oId1 = insertAndAdd(points1); @SuppressWarnings("unused") RevCommit c3 = geogig.command(CommitOp.class).setMessage("commit for " + idP1 + " again") .call(); try { geogig.command(RevertOp.class).addCommit(Suppliers.ofInstance(c2.getId())).call(); fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1)); } }
fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1));
fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1));
@Test public void testStillDeletedMergeConflictResolution() throws Exception { insertAndAdd(points1); @SuppressWarnings("unused") RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); deleteAndAdd(points1); RevCommit c2 = geogig.command(CommitOp.class).setMessage("commit for removing " + idP1) .call(); @SuppressWarnings("unused") ObjectId oId1 = insertAndAdd(points1); @SuppressWarnings("unused") RevCommit c3 = geogig.command(CommitOp.class).setMessage("commit for " + idP1 + " again") .call(); try { geogig.command(RevertOp.class).addCommit(c2.getId()).call(); fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1)); } }
fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1));
fail(); } catch (RevertConflictsException e) { assertTrue(e.getMessage().contains(idP1));