|
|||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | ||||||||
java.lang.Objectorg.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, sourceCommits, sourceObjects, sourceTrees, walk |
| Constructor Summary | |
|---|---|
protected |
ThreeWayMerger(Repository local)
Create a new merge instance for a repository. |
| Method Summary | |
|---|---|
boolean |
merge(AnyObjectId[] tips)
Merge together two or more tree-ish objects. |
boolean |
merge(AnyObjectId a,
AnyObjectId b)
Merge together two 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 |
|---|
getObjectWriter, getRepository, getResultTreeId, mergeBase, mergeImpl, openTree |
| 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.| Method Detail |
|---|
public void setBase(AnyObjectId id)
throws MissingObjectException,
IncorrectObjectTypeException,
java.io.IOException
id - common base treeish; null to automatically compute the common
base from the input commits during
merge(AnyObjectId, AnyObjectId).
IncorrectObjectTypeException - the object is not a treeish.
MissingObjectException - the object does not exist.
java.io.IOException - the object could not be read.
public boolean merge(AnyObjectId a,
AnyObjectId b)
throws java.io.IOException
Any tree-ish may be supplied as inputs. Commits and/or tags pointing at trees or commits may be passed as input objects.
a - source tree to be combined together.b - source tree to be combined together.
IncorrectObjectTypeException - one of the input objects is not a commit, but the strategy
requires it to be a commit.
java.io.IOException - one or more sources could not be read, or outputs could not
be written to the Repository.
public boolean merge(AnyObjectId[] tips)
throws java.io.IOException
MergerAny 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 Mergertips - 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.
java.io.IOException - one or more sources could not be read, or outputs could not
be written to the Repository.
protected AbstractTreeIterator mergeBase()
throws java.io.IOException
java.io.IOException
|
|||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | ||||||||