Examples of org.eclipse.jgit.merge.ResolveMerger.failed()

Class org.eclipse.jgit.merge.ResolveMerger

Examples of org.eclipse.jgit.merge.ResolveMerger.failed()

org.eclipse.jgit.merge.ResolveMerger.failed()
Returns whether this merge failed (i.e. not stopped because of a conflict) @return true if a failure occurred, falseotherwise


            cherryPickedRefs.add(src);
         }
         else
         {
            if (merger.failed())
               return new CherryPickResult(merger.getFailingPaths());


            // there are merge conflicts
            String message = new MergeMessageFormatter()
                     .formatWithConflicts(srcCommit.getFullMessage(),

View Full Code Here

                  "cherry-pick: "
                      + srcCommit.getShortMessage())
              .setAuthor(srcCommit.getAuthorIdent()).call();
          cherryPickedRefs.add(src);
        } else {
          if (merger.failed())
            return new CherryPickResult(merger.getFailingPaths());


          // there are merge conflicts


          String message = new MergeMessageFormatter()

View Full Code Here


            cherryPickedRefs.add(src);
         }
         else
         {
            if (merger.failed())
               return new CherryPickResult(merger.getFailingPaths());


            // there are merge conflicts
            String message = new MergeMessageFormatter()
                     .formatWithConflicts(srcCommit.getFullMessage(),

View Full Code Here

                  "cherry-pick: "
                      + srcCommit.getShortMessage())
              .setAuthor(srcCommit.getAuthorIdent()).call();
          cherryPickedRefs.add(src);
        } else {
          if (merger.failed())
            return new CherryPickResult(merger.getFailingPaths());


          // there are merge conflicts


          String message = new MergeMessageFormatter()

View Full Code Here

                merger.getBaseCommit(0, 1),
                new ObjectId[] { headCommit.getId(),
                    srcParent.getId() },
                MergeStatus.CONFLICTING, MergeStrategy.RESOLVE,
                merger.getMergeResults(), failingPaths, null);
          if (!merger.failed() && !unmergedPaths.isEmpty()) {
            String message = new MergeMessageFormatter()
            .formatWithConflicts(newMessage,
                merger.getUnmergedPaths());
            repo.writeRevertHead(srcCommit.getId());
            repo.writeMergeCommitMsg(message);

View Full Code Here

                  "cherry-pick: " //$NON-NLS-1$
                      + srcCommit.getShortMessage())
              .setAuthor(srcCommit.getAuthorIdent()).call();
          cherryPickedRefs.add(src);
        } else {
          if (merger.failed())
            return new CherryPickResult(merger.getFailingPaths());


          // there are merge conflicts


          String message = new MergeMessageFormatter()

View Full Code Here

                new ObjectId[] { headCommit.getId(),
                    srcParent.getId() },
                MergeStatus.CONFLICTING,
                MergeStrategy.RECURSIVE,
                merger.getMergeResults(), failingPaths, null);
          if (!merger.failed() && !unmergedPaths.isEmpty()) {
            String message = new MergeMessageFormatter()
            .formatWithConflicts(newMessage,
                merger.getUnmergedPaths());
            repo.writeRevertHead(srcCommit.getId());
            repo.writeMergeCommitMsg(message);

View Full Code Here

              .setReflogComment(reflogPrefix + " " //$NON-NLS-1$
                  + srcCommit.getShortMessage())
              .setAuthor(srcCommit.getAuthorIdent()).call();
          cherryPickedRefs.add(src);
        } else {
          if (merger.failed())
            return new CherryPickResult(merger.getFailingPaths());


          // there are merge conflicts


          String message = new MergeMessageFormatter()

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.