Examples of org.eclipse.jgit.api.MergeCommand.call()

org.eclipse.jgit.api.MergeCommand.call()
Executes the {@code Merge} command with all the options and parameterscollected by the setter methods (e.g. {@link #include(Ref)}) of this class. Each instance of this class should only be used for one invocation of the command. Don't call this method twice on an instance. @return the result of the merge

      mergeCmd.include(srcRef);
    else
      mergeCmd.include(src);
    MergeResult result;
    try {
      result = mergeCmd.call();
    } catch (CheckoutConflictException e) {
      result = new MergeResult(e.getConflictingPaths()); // CHECKOUT_CONFLICT
    }


    switch (result.getMergeStatus()) {

View Full Code Here

    if (message != null)
      mergeCmd.setMessage(message);


    MergeResult result;
    try {
      result = mergeCmd.call();
    } catch (CheckoutConflictException e) {
      result = new MergeResult(e.getConflictingPaths()); // CHECKOUT_CONFLICT
    }


    switch (result.getMergeStatus()) {

View Full Code Here

          merge.setStrategy(mergeStrategy);
        }
        if (message != null)
          merge.setMessage(message);
        try {
          mergeResult = merge.call();
          mymonitor.worked(1);
          if (MergeResult.MergeStatus.NOT_SUPPORTED.equals(mergeResult.getMergeStatus()))
            throw new TeamException(new Status(IStatus.INFO, Activator.getPluginId(), mergeResult.toString()));
        } catch (NoHeadException e) {
          throw new TeamException(CoreText.MergeOperation_MergeFailedNoHead, e);

View Full Code Here

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.