Examples of org.eclipse.jgit.merge.MergeFormatter.formatMerge()

org.eclipse.jgit.merge.MergeFormatter.formatMerge()

Formats the results of a merge of {@link RawText} objects in a Gitconformant way. This method also assumes that the {@link RawText} objectsbeing merged are line oriented files which use LF as delimiter. This method will also use LF to separate chunks and conflict metadata, therefore it fits only to texts that are LF-separated lines. @param out the outputstream where to write the textual presentation @param res the merge result which should be presented @param seqName When a conflict is reported each conflicting range will get a name. This name is following the "<<<<<<< " or ">>>>>>> " conflict markers. The names for the sequences are given in this list @param charsetName the name of the characterSet used when writing conflict metadata @throws IOException

        Map<String, ObjectId> resolved = new HashMap<String, ObjectId>();
        for (String path : r.keySet()) {
          MergeResult<? extends Sequence> p = r.get(path);
          TemporaryBuffer buf = new TemporaryBuffer.LocalFile(10 * 1024 * 1024);
          try {
            fmt.formatMerge(buf, p, "BASE", oursName, theirsName, "UTF-8");
            buf.close();


            InputStream in = buf.openInputStream();
            try {
              resolved.put(path, ins.insert(Constants.OBJ_BLOB, buf.length(), in));

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.