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))); } } }
public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs(), e.getReport()); super.initCause(e); this.importResult = importResult; }
public GeopkgMergeConflictsException(MergeConflictsException e, GeopkgImportResult importResult) { super(e.getMessage(), e.getOurs(), e.getTheirs()); this.importResult = importResult; }
mergeScenarioReport = mc.getReport(); conflictCount = mergeScenarioReport.getConflicts();
postStatus.getNumConflicts()); getProgressListener().setDescription(msg); throw new MergeConflictsException(msg);
public @Test void prepareAndManuallyResolveAllConflicts() { createConflicts(TestData.point1, TestData.line1, TestData.poly1); PRStatus result = prepare(); assertEquals(3, result.getNumConflicts()); final UUID transactionId = request.getTransactionId(); origin.resumeTransaction(transactionId); assertEquals(request.getTargetBranch(), origin.getRef("HEAD").peel().localName()); //@formatter:off SimpleFeature c1 = TestData.clone(TestData.point1); c1.setAttribute("sp", "manually set"); SimpleFeature c2 = TestData.clone(TestData.line1); c2.setAttribute("sp", "manually set"); SimpleFeature c3 = TestData.clone(TestData.poly1); c3.setAttribute("sp", "manually set"); //@formatter:on Context context = clone.checkout("issuerBranch").getContext(); try { PullResult pres = context.command(PullOp.class).addRefSpec("master").call(); fail("Expected MergeConflictsException , got " + pres); } catch (MergeConflictsException e) { assertEquals(3, e.getReport().getConflicts()); clone.insert(c1, c2, c3).add().commit("manual conflict fix"); } result = prepare(); assertTrue(result.getMergeCommit().isPresent()); assertTrue(result.getReport().isPresent()); GeogigTransaction prtx = getTransaction(); Optional<Ref> mergeRef = request.resolveMergeRef(prtx); assertTrue(mergeRef.isPresent()); assertEquals(result.getMergeCommit().get(), mergeRef.get().getObjectId()); }
command(SaveMergeCommitMessageOp.class).setMessage(mergeMsg).call(); throw new MergeConflictsException(conflictMsg, headCommit.getId(), commitId);
@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("Expected MergeConflictsException , got " + pres); } catch (MergeConflictsException e) { assertEquals(3, e.getReport().getConflicts()); clone.insert(c1, c2, c3).add().commit("manual conflict fix");
command(SaveMergeCommitMessageOp.class).setMessage(mergeMsg).call(); throw new MergeConflictsException(conflictMsg, headCommit.getId(), commitId, mergeScenario);
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
fail("Expected MergeConflictsException , got " + pres); } catch (MergeConflictsException e) { assertEquals(3, e.getReport().getConflicts()); clone.insert(c1, c2, c3).add().commit("manual conflict fix");
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
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)); }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));
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()); }
fail(); } catch (MergeConflictsException e) { assertTrue(e.getMessage().contains("conflict"));