public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs()); this.importResult = importResult; }
public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs(), e.getReport()); super.initCause(e); this.importResult = importResult; }
private void mergeExpectConflicts(int count) { try { PRStatus status = merge(); fail("Expected MergeConflictsException, got " + status); } catch (MergeConflictsException expected) { assertTrue(expected.getMessage().contains(String.format("%,d conflict(s)", count))); } } }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
@Test public void testResetPathFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); RevCommit resetCommit = geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1) .setCommit(Suppliers.ofInstance(resetCommit.getId())).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase(); assertEquals(0, conflicts.getCountByPrefix(null, null)); }
@Test public void testResetPathFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); RevCommit resetCommit = geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } geogig.command(ResetOp.class).addPattern(pointsName + "/" + idP1) .setCommit(Suppliers.ofInstance(resetCommit.getId())).call(); Repository repository = geogig.getRepository(); ConflictsDatabase conflicts = repository.conflictsDatabase(); assertEquals(0, conflicts.getCountByPrefix(null, null)); }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
@Test public void testInsertionAndAdditionFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } insert(points1); geogig.command(AddOp.class).call(); assertFalse(geogig.getRepository().conflictsDatabase().hasConflicts(null)); geogig.command(CommitOp.class).call(); Optional<Ref> ref = geogig.command(RefParse.class).setName(Ref.MERGE_HEAD).call(); assertFalse(ref.isPresent()); }
@Test public void testInsertionAndAdditionFixesConflict() throws Exception { Feature points1Modified = feature(pointsType, idP1, "StringProp1_2", new Integer(1000), "POINT(1 1)"); Feature points1ModifiedB = feature(pointsType, idP1, "StringProp1_3", new Integer(2000), "POINT(1 1)"); insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } insert(points1); geogig.command(AddOp.class).call(); assertFalse(geogig.getRepository().conflictsDatabase().hasConflicts(null)); geogig.command(CommitOp.class).call(); Optional<Ref> ref = geogig.command(RefParse.class).setName(Ref.MERGE_HEAD).call(); assertFalse(ref.isPresent()); }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
private void createConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 modified and points 2 added // | // o - master - HEAD - Points 1 modifiedB insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
private void createConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 modified and points 2 added // | // o - master - HEAD - Points 1 modifiedB insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
private void createDeleteTheirsConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 deleted and points 2 added // | // o - master - HEAD - Points 1 modified insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); geogig.command(RemoveOp.class).addPathToRemove(NodeRef.appendChild(pointsName, idP1)) .call(); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }
private void createDeleteTheirsConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 deleted and points 2 added // | // o - master - HEAD - Points 1 modified insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); insertAndAdd(points1Modified); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); geogig.command(RemoveOp.class).addPathToRemove(NodeRef.appendChild(pointsName, idP1)) .call(); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }
private void createDeleteOursConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 deleted and points 2 added // | // o - master - HEAD - Points 1 modified insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); geogig.command(RemoveOp.class).addPathToRemove(NodeRef.appendChild(pointsName, idP1)) .call(); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }
private void createDeleteOursConflictedState() throws Exception { // Create the following revision graph // o // | // o - Points 1 added // |\ // | o - TestBranch - Points 1 deleted and points 2 added // | // o - master - HEAD - Points 1 modified insertAndAdd(points1); geogig.command(CommitOp.class).call(); geogig.command(BranchCreateOp.class).setName("TestBranch").call(); geogig.command(RemoveOp.class).addPathToRemove(NodeRef.appendChild(pointsName, idP1)) .call(); geogig.command(CommitOp.class).call(); geogig.command(CheckoutOp.class).setSource("TestBranch").call(); insertAndAdd(points1ModifiedB); insertAndAdd(points2); 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()).call(); fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict")); } }