motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "ResolveMerger: push result file creation into updateIndex()"

This commit is contained in:
Matthias Sohn 2014-08-08 18:34:47 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 678a94fc66 2c33c725f9
commit d87a2524da
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -635,8 +635,7 @@ protected boolean processEntry(CanonicalTreeParser base,
MergeResult<RawText> result = contentMerge(base, ours, theirs); MergeResult<RawText> result = contentMerge(base, ours, theirs);
if (ignoreConflicts) if (ignoreConflicts)
result.setContainsConflicts(false); result.setContainsConflicts(false);
File of = writeMergedFile(result); updateIndex(base, ours, theirs, result);
updateIndex(base, ours, theirs, result, of);
if (result.containsConflicts() && !ignoreConflicts) if (result.containsConflicts() && !ignoreConflicts)
unmergedPaths.add(tw.getPathString()); unmergedPaths.add(tw.getPathString());
modifiedFiles.add(tw.getPathString()); modifiedFiles.add(tw.getPathString());
@ -750,14 +749,14 @@ private boolean isWorktreeDirty(WorkingTreeIterator work,
* @param ours * @param ours
* @param theirs * @param theirs
* @param result * @param result
* @param of
* @throws FileNotFoundException * @throws FileNotFoundException
* @throws IOException * @throws IOException
*/ */
private void updateIndex(CanonicalTreeParser base, private void updateIndex(CanonicalTreeParser base,
CanonicalTreeParser ours, CanonicalTreeParser theirs, CanonicalTreeParser ours, CanonicalTreeParser theirs,
MergeResult<RawText> result, File of) throws FileNotFoundException, MergeResult<RawText> result) throws FileNotFoundException,
IOException { IOException {
File of = writeMergedFile(result);
if (result.containsConflicts()) { if (result.containsConflicts()) {
// a conflict occurred, the file will contain conflict markers // a conflict occurred, the file will contain conflict markers
// the index will be populated with the three stages and only the // the index will be populated with the three stages and only the