public class RecursiveMerger extends ResolveMerger
ResolveMerger.MergeFailureReason
Modifier and Type | Field | Description |
---|---|---|
int |
MAX_BASES |
The maximum number of merge bases.
|
db, reader, sourceCommits, sourceObjects, sourceTrees, walk
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, workingTreeIterator
Modifier | Constructor | 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 | 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.
|
getBaseCommit, getObjectInserter, getRepository, merge, openTree, setObjectInserter
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
cleanUp, failed, getCommitNames, getFailingPaths, getMergeResults, getModifiedFiles, getResultTreeId, getToBeCheckedOut, getUnmergedPaths, mergeImpl, mergeTrees, mergeTreeWalk, processEntry, setCommitNames, setDirCache, setWorkingTreeIterator
getBaseCommitId, merge, mergeBase, setBase
public 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 Merger
a
- the first commit in Merger.sourceObjects
.b
- the second commit in Merger.sourceObjects
.IOException
IncorrectObjectTypeException
protected 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 recursivelyIOException
IncorrectObjectTypeException
- 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 © 2018. All rights reserved.