|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object org.eclipse.jgit.merge.Merger org.eclipse.jgit.merge.ThreeWayMerger
public abstract class ThreeWayMerger
A merge of 2 trees, using a common base ancestor tree.
Field Summary |
---|
Fields inherited from class org.eclipse.jgit.merge.Merger |
---|
db, reader, sourceCommits, sourceObjects, sourceTrees, walk |
Constructor Summary | |
---|---|
protected |
ThreeWayMerger(Repository local)
Create a new merge instance for a repository. |
protected |
ThreeWayMerger(Repository local,
boolean inCore)
Create a new merge instance for a repository. |
Method Summary | |
---|---|
boolean |
merge(AnyObjectId... tips)
Merge together two or more tree-ish objects. |
protected AbstractTreeIterator |
mergeBase()
Create an iterator to walk the merge base. |
void |
setBase(AnyObjectId id)
Set the common ancestor tree. |
Methods inherited from class org.eclipse.jgit.merge.Merger |
---|
getBaseCommit, getObjectInserter, getRepository, getResultTreeId, mergeBase, mergeImpl, openTree, setObjectInserter |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
protected ThreeWayMerger(Repository local)
local
- the repository this merger will read and write data on.protected ThreeWayMerger(Repository local, boolean inCore)
local
- the repository this merger will read and write data on.inCore
- perform the merge in core with no working folder involvedMethod Detail |
---|
public void setBase(AnyObjectId id) throws MissingObjectException, IncorrectObjectTypeException, IOException
id
- common base treeish; null to automatically compute the common
base from the input commits during
merge(AnyObjectId...)
.
IncorrectObjectTypeException
- the object is not a treeish.
MissingObjectException
- the object does not exist.
IOException
- the object could not be read.public boolean merge(AnyObjectId... tips) throws IOException
Merger
Any tree-ish may be supplied as inputs. Commits and/or tags pointing at trees or commits may be passed as input objects.
merge
in class Merger
tips
- source trees to be combined together. The merge base is not
included in this set.
IncorrectObjectTypeException
- one of the input objects is not a commit, but the strategy
requires it to be a commit.
IOException
- one or more sources could not be read, or outputs could not
be written to the Repository.protected AbstractTreeIterator mergeBase() throws IOException
IOException
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |