public class RecursiveMerger extends ResolveMerger
ResolveMerger.MergeFailureReason| Modifier and Type | Field and Description |
|---|---|
int |
MAX_BASES
The maximum number of merge bases.
|
builder, commitNames, dircache, enterSubtree, failingPaths, implicitDirCache, inCore, mergeAlgorithm, mergeResults, modifiedFiles, resultTree, T_BASE, T_FILE, T_INDEX, T_OURS, T_THEIRS, toBeCheckedOut, toBeDeleted, tw, unmergedPaths, workingTreeIteratordb, reader, sourceCommits, sourceObjects, sourceTrees, walk| Modifier | Constructor and Description |
|---|---|
protected |
RecursiveMerger(Repository local)
Normal recursive merge, implies not inCore
|
protected |
RecursiveMerger(Repository local,
boolean inCore)
Normal recursive merge when you want a choice of DirCache placement
inCore
|
| Modifier and Type | Method and Description |
|---|---|
protected RevCommit |
getBaseCommit(RevCommit a,
RevCommit b)
Get a single base commit for two given commits.
|
protected RevCommit |
getBaseCommit(RevCommit a,
RevCommit b,
int callDepth)
Get a single base commit for two given commits.
|
cleanUp, failed, getCommitNames, getFailingPaths, getMergeResults, getModifiedFiles, getResultTreeId, getToBeCheckedOut, getUnmergedPaths, mergeImpl, mergeTrees, mergeTreeWalk, processEntry, setCommitNames, setDirCache, setWorkingTreeIteratorgetBaseCommitId, merge, mergeBase, setBasegetBaseCommit, getObjectInserter, getRepository, merge, openTree, setObjectInserterpublic final int MAX_BASES
protected RecursiveMerger(Repository local, boolean inCore)
local - inCore - protected RecursiveMerger(Repository local)
local - protected RevCommit getBaseCommit(RevCommit a, RevCommit b) throws IncorrectObjectTypeException, IOException
getBaseCommit in class Mergera - the first commit in Merger.sourceObjects.b - the second commit in Merger.sourceObjects.IOExceptionIncorrectObjectTypeExceptionprotected RevCommit getBaseCommit(RevCommit a, RevCommit b, int callDepth) throws IOException
a - the first commit to be mergedb - the second commit to be mergedcallDepth - the callDepth when this method is called recursivelyIOExceptionIncorrectObjectTypeException - one of the input objects is not a commit.NoMergeBaseException - too many merge bases are found or the computation of a common
merge base failed (e.g. because of a conflict).Copyright © 2014. All rights reserved.