|
|
|
@ -480,61 +480,6 @@ public class ResolveMerger extends ThreeWayMerger {
|
|
|
|
|
return newEntry; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Processes one path and tries to merge taking git attributes in account. |
|
|
|
|
* This method will do all trivial (not content) merges and will also detect |
|
|
|
|
* if a merge will fail. The merge will fail when one of the following is |
|
|
|
|
* true |
|
|
|
|
* <ul> |
|
|
|
|
* <li>the index entry does not match the entry in ours. When merging one |
|
|
|
|
* branch into the current HEAD, ours will point to HEAD and theirs will |
|
|
|
|
* point to the other branch. It is assumed that the index matches the HEAD |
|
|
|
|
* because it will only not match HEAD if it was populated before the merge |
|
|
|
|
* operation. But the merge commit should not accidentally contain |
|
|
|
|
* modifications done before the merge. Check the <a href= |
|
|
|
|
* "http://www.kernel.org/pub/software/scm/git/docs/git-read-tree.html#_3_way_merge" |
|
|
|
|
* >git read-tree</a> documentation for further explanations.</li> |
|
|
|
|
* <li>A conflict was detected and the working-tree file is dirty. When a |
|
|
|
|
* conflict is detected the content-merge algorithm will try to write a |
|
|
|
|
* merged version into the working-tree. If the file is dirty we would |
|
|
|
|
* override unsaved data.</li> |
|
|
|
|
* </ul> |
|
|
|
|
* |
|
|
|
|
* @param base |
|
|
|
|
* the common base for ours and theirs |
|
|
|
|
* @param ours |
|
|
|
|
* the ours side of the merge. When merging a branch into the |
|
|
|
|
* HEAD ours will point to HEAD |
|
|
|
|
* @param theirs |
|
|
|
|
* the theirs side of the merge. When merging a branch into the |
|
|
|
|
* current HEAD theirs will point to the branch which is merged |
|
|
|
|
* into HEAD. |
|
|
|
|
* @param index |
|
|
|
|
* the index entry |
|
|
|
|
* @param work |
|
|
|
|
* the file in the working tree |
|
|
|
|
* @param ignoreConflicts |
|
|
|
|
* see |
|
|
|
|
* {@link org.eclipse.jgit.merge.ResolveMerger#mergeTrees(AbstractTreeIterator, RevTree, RevTree, boolean)} |
|
|
|
|
* @return <code>false</code> if the merge will fail because the index entry |
|
|
|
|
* didn't match ours or the working-dir file was dirty and a |
|
|
|
|
* conflict occurred |
|
|
|
|
* @throws org.eclipse.jgit.errors.MissingObjectException |
|
|
|
|
* @throws org.eclipse.jgit.errors.IncorrectObjectTypeException |
|
|
|
|
* @throws org.eclipse.jgit.errors.CorruptObjectException |
|
|
|
|
* @throws java.io.IOException |
|
|
|
|
* @since 3.5 |
|
|
|
|
*/ |
|
|
|
|
@Deprecated |
|
|
|
|
protected boolean processEntry(CanonicalTreeParser base, |
|
|
|
|
CanonicalTreeParser ours, CanonicalTreeParser theirs, |
|
|
|
|
DirCacheBuildIterator index, WorkingTreeIterator work, |
|
|
|
|
boolean ignoreConflicts) throws MissingObjectException, |
|
|
|
|
IncorrectObjectTypeException, CorruptObjectException, IOException { |
|
|
|
|
return processEntry(base, ours, theirs, index, work, ignoreConflicts, |
|
|
|
|
null); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Processes one path and tries to merge taking git attributes in account. |
|
|
|
|
* This method will do all trivial (not content) merges and will also detect |
|
|
|
|