Package org.eclipse.jgit.merge

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

151
152
153
154
155
156
157
158
159
160
161
                  "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
325
326
327
328
329
330
331
332
333
334
335
            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
146
147
148
149
150
151
152
153
154
155
156
          newHead = new Git(getRepository()).commit()
              .setMessage(srcCommit.getFullMessage())
              .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
339
340
341
342
343
344
345
346
347
348
349
            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
325
326
327
328
329
330
331
332
333
334
335
            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
307
308
309
310
311
312
313
314
315
316
317
            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
203
204
205
206
207
208
209
210
211
212
213
                merger.getBaseCommitId(),
                new ObjectId[] { headCommit.getId(),
                    srcParent.getId() },
                MergeStatus.CONFLICTING, strategy,
                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
170
171
172
173
174
175
176
177
178
179
180
                .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
338
339
340
341
342
343
344
345
346
347
348
            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
171
172
173
174
175
176
177
178
179
180
181
                  "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
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
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.