Examples of merge()

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

2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
      } else if (revWalk.isMergedInto(branchTip, srcTip)) {
        // fast-forward
        return MergeStatus.MERGEABLE;
      }
      RecursiveMerger merger = (RecursiveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
      boolean canMerge = merger.merge(branchTip, srcTip);
      if (canMerge) {
        return MergeStatus.MERGEABLE;
      }
    } catch (IOException e) {
      LOGGER.error("Failed to determine canMerge", e);
View Full Code Here

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

134
135
136
137
138
139
140
141
142
143
144
        ResolveMerger merger = (ResolveMerger) MergeStrategy.RESOLVE
            .newMerger(repo);
        merger.setWorkingTreeIterator(new FileTreeIterator(repo));
        merger.setBase(srcParent.getTree());
        if (merger.merge(headCommit, srcCommit)) {
          if (AnyObjectId.equals(headCommit.getTree().getId(), merger
              .getResultTreeId()))
            continue;
          DirCacheCheckout dco = new DirCacheCheckout(repo,
              headCommit.getTree(), repo.lockDirCache(),
View Full Code Here

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

202
203
204
205
206
207
208
209
210
211
212
        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

Examples of org.eclipse.jgit.notes.NoteMapMerger.merge()

232
233
234
235
236
237
238
239
240
241
242
            revWalk.parseCommit(refUpdate.getOldObjectId());
        final NoteMap theirNoteMap =
            NoteMap.read(revWalk.getObjectReader(), theirsCommit);
        final NoteMapMerger merger = new NoteMapMerger(repo);
        final NoteMap merged =
            merger.merge(baseNoteMap, ourNoteMap, theirNoteMap);
        final ObjectId mergeCommit =
            createCommit(merged, inserter, gerritIdent,
                "Merged note commits\n", oursCommit, theirsCommit);
        refUpdate = createRefUpdate(repo, mergeCommit, theirsCommit);
        remainingLockFailureCalls = MAX_LOCK_FAILURE_CALLS;
View Full Code Here

Examples of org.eclipse.jgit.notes.NoteMerger.merge()

177
178
179
180
181
182
183
184
185
186
187
      // means: base == null
      // there is not really a common ancestry for these two note revisions
      // use the same NoteMerger that is used from the NoteMapMerger
      NoteMerger noteMerger = new ReviewNoteMerger();
      Note newNote = new Note(c, noteContent);
      noteContent = noteMerger.merge(null, newNote, ours.getNote(c),
          reader, inserter).getData();
    }
    ours.set(c, noteContent);
  }
View Full Code Here

Examples of org.eclipse.ltk.core.refactoring.CompositeChange.merge()

1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
          if (status.hasFatalError())
            fChangeManager = new TextChangeManager();
        }
        // </workaround>

        composite
            .merge(new CompositeChange(
                RefactoringCoreMessages.MoveRefactoring_reorganize_elements,
                fChangeManager.getAllChanges()));

        Change fileMove = createSimpleMoveChange(new SubProgressMonitor(
View Full Code Here

Examples of org.eclipse.ltk.core.refactoring.RefactoringStatus.merge()

362
363
364
365
366
367
368
369
370
371
372
      throws CoreException, OperationCanceledException {
    final RefactoringStatus status = new RefactoringStatus();
    try {
      monitor.beginTask(Messages.ConvertConstantsToEnumRefactoring_CheckingPreconditions, 1);
      if (this.fieldsToRefactor.isEmpty())
        status
            .merge(RefactoringStatus
                .createFatalErrorStatus(Messages.ConvertConstantsToEnumRefactoring_FieldsHaveNotBeenSpecified));

      else {
        for (final Iterator it = this.fieldsToRefactor.listIterator(); it
View Full Code Here

Examples of org.eclipse.persistence.jpa.rs.PersistenceContext.merge()

206
207
208
209
210
211
212
213
214
215
216
        } catch (JAXBException e) {
            JPARSLogger.fine("exception_while_unmarhalling_entity", new Object[] { type, persistenceUnit, e.toString() });
            return Response.status(Status.BAD_REQUEST).type(StreamingOutputMarshaller.getResponseMediaType(hh)).build();
        }

        entity = app.merge(getMatrixParameters(uriInfo, persistenceUnit), entity);
        return Response.ok(new StreamingOutputMarshaller(app, entity, hh.getAcceptableMediaTypes())).build();
    }

    protected Response setOrAddAttribute(String version, String persistenceUnit, String type, String key, String attribute, HttpHeaders hh, UriInfo ui, URI baseURI, InputStream in) {
        PersistenceContext app = getPersistenceContext(persistenceUnit, baseURI, version, null);
View Full Code Here

Examples of org.eclipse.sapphire.modeling.Status.CompositeStatusFactory.merge()

115
116
117
118
119
120
121
122
123
124
125
    {
        final CompositeStatusFactory factory = Status.factoryForComposite();
       
        for( Rule rule : this.rules )
        {
            factory.merge( rule.validation() );
        }
       
        return factory.create();
    }
View Full Code Here

Examples of org.eclipse.team.core.mapping.IMergeContext.merge()

175
176
177
178
179
180
181
182
183
184
185
    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
    assertContentEquals(workspaceFile, branchChanges + initialContent
        + masterChanges);
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.