Examples of MergeConflict


        GraftContext ctx = GraftCommand.on(repo).execute(changed1);
        Assert.assertNotNull(ctx);
        Assert.assertTrue(ctx.getFlagConflicts().isEmpty());
        Assert.assertTrue(ctx.getKeepDeleteConflicts().isEmpty());
        MergeConflict mergeConflict = Utils.single(ctx.getMergeConflicts());
        Assert.assertNotNull(mergeConflict);
        // Mercurial 2.2 will skip empty commits, so we must resolve
        // with new content.
        writeFile("file", "XY");
        mergeConflict.markResolved();
        Changeset cs = ctx.commit();
        Assert.assertNotNull(cs);
        Assert.assertEquals(changed1.getNode(), cs.getExtra().getString("source"));
    }

Examples of com.aragost.javahg.merge.MergeConflict

        commit();


        ConflictResolvingContext mergeState = repo.workingCopy().merge(parent2);
        List<MergeConflict> mergeConflicts = mergeState.getMergeConflicts();
        Assert.assertEquals(2, mergeConflicts.size());
        MergeConflict mca = mergeConflicts.get(0);
        MergeConflict mcb = mergeConflicts.get(1);
        Assert.assertEquals("a", mca.getFilename());
        Assert.assertEquals("b", mcb.getFilename());


        Assert.assertFalse(mca.isResolved());
        Assert.assertFalse(mcb.isResolved());


        mca.resolveWithInternalMerge();
        mcb.resolveWithInternalMerge();


        Assert.assertFalse(mca.isResolved());
        Assert.assertTrue(mcb.isResolved());


    }

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.