Examples of org.eclipse.jgit.merge.Merger.merge()

org.eclipse.jgit.merge.Merger.merge()
Merge together two or more tree-ish objects.
Any tree-ish may be supplied as inputs. Commits and/or tags pointing at trees or commits may be passed as input objects. @param tips source trees to be combined together. The merge base is not included in this set. @return true if the merge was completed without conflicts; false if themerge strategy cannot handle this merge or there were conflicts preventing it from automatically resolving all paths. @throws IncorrectObjectTypeException one of the input objects is not a commit, but the strategy requires it to be a commit. @throws IOException one or more sources could not be read, or outputs could not be written to the Repository.

        if (merger instanceof ResolveMerger) {
          ResolveMerger resolveMerger = (ResolveMerger) merger;
          resolveMerger.setCommitNames(new String[] {
              "BASE", "HEAD", ref.getName() });
          resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
          noProblems = merger.merge(headCommit, srcCommit);
          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else

View Full Code Here

          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else
          noProblems = merger.merge(headCommit, srcCommit);
        refLogMessage.append(": Merge made by ");
        refLogMessage.append(mergeStrategy.getName());
        refLogMessage.append('.');
        if (noProblems) {
          dco = new DirCacheCheckout(repo,

View Full Code Here

        if (merger instanceof ResolveMerger) {
          ResolveMerger resolveMerger = (ResolveMerger) merger;
          resolveMerger.setCommitNames(new String[] {
              "BASE", "HEAD", ref.getName() });
          resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
          noProblems = merger.merge(headCommit, srcCommit);
          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else

View Full Code Here

          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else
          noProblems = merger.merge(headCommit, srcCommit);
        refLogMessage.append(": Merge made by ");
        if (!revWalk.isMergedInto(headCommit, srcCommit))
          refLogMessage.append(mergeStrategy.getName());
        else
          refLogMessage.append("recursive");

View Full Code Here

            theirsList);


      resultTreeId = m.getResultTreeId();
    } else {
      Merger m = nonNotesMergeStrategy.newMerger(db, true);
      if (!m.merge(new AnyObjectId[] { oursId, theirsId }))
        throw new NotesMergeConflictException(baseList, oursList,
            theirsList);
      resultTreeId = m.getResultTreeId();
    }
    AbbreviatedObjectId none = AbbreviatedObjectId.fromString("");

View Full Code Here

        if (merger instanceof ResolveMerger) {
          ResolveMerger resolveMerger = (ResolveMerger) merger;
          resolveMerger.setCommitNames(new String[] {
              "BASE", "HEAD", ref.getName() }); //$NON-NLS-1$ //$NON-NLS-2$
          resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
          noProblems = merger.merge(headCommit, srcCommit);
          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else

View Full Code Here

          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else
          noProblems = merger.merge(headCommit, srcCommit);
        refLogMessage.append(": Merge made by "); //$NON-NLS-1$
        if (!revWalk.isMergedInto(headCommit, srcCommit))
          refLogMessage.append(mergeStrategy.getName());
        else
          refLogMessage.append("recursive"); //$NON-NLS-1$

View Full Code Here

    inserter.flush();


    Merger m = nonNotesMergeStrategy.newMerger(db, true);
    if (m instanceof ThreeWayMerger)
      ((ThreeWayMerger) m).setBase(baseId);
    if (!m.merge(oursId, theirsId))
      throw new NotesMergeConflictException(baseList, oursList,
          theirsList);
    ObjectId resultTreeId = m.getResultTreeId();
    AbbreviatedObjectId none = AbbreviatedObjectId.fromString(""); //$NON-NLS-1$
    return NoteParser.parse(none, resultTreeId, reader).nonNotes;

View Full Code Here

    RevCommit b2Tip = tr.branch("b2").commit().parent(parent).add("y", "y")
        .create();


    // merge b1Tip and b2Tip and update refs/heads/b1 to the merge commit
    Merger merger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(repo);
    merger.merge(b1Tip, b2Tip);
    CommitBuilder cb = tr.commit();
    cb.parent(b1Tip).parent(b2Tip);
    cb.setTopLevelTree(merger.getResultTreeId());
    RevCommit mergeCommit = cb.create();
    RefUpdate u = repo.updateRef("refs/heads/b1");

View Full Code Here

        if (merger instanceof ResolveMerger) {
          ResolveMerger resolveMerger = (ResolveMerger) merger;
          resolveMerger.setCommitNames(new String[] {
              "BASE", "HEAD", ref.getName() });
          resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo));
          noProblems = merger.merge(headCommit, srcCommit);
          lowLevelResults = resolveMerger
              .getMergeResults();
          failingPaths = resolveMerger.getFailingPaths();
          unmergedPaths = resolveMerger.getUnmergedPaths();
        } else

View Full Code Here

0 1

TOP

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.