motiejus
/
jgit
1
Fork 0
Code Releases Activity

ResolveMerger: add coverage for inCore file => directory transition 

Change-Id: I6c3473932eb418a036f5943c78e619184559ef3a
This commit is contained in:
Han-Wen Nienhuys 2022-08-08 17:49:14 +02:00
parent 5709317f71
commit 3b4a636183
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java
View File

@ -1002,6 +1002,39 @@ public void checkContentMergeConflict_noTree(MergeStrategy strategy)
}
}
@Theory
public void fileBecomesDir_noTree(MergeStrategy strategy)
throws Exception {
Git git = Git.wrap(db);
writeTrashFile("file", "1\n2\n3");
writeTrashFile("side", "1\n2\n3");
git.add().addFilepattern("file").addFilepattern("side").call();
RevCommit first = git.commit().setMessage("base").call();
writeTrashFile("side", "our changed");
RevCommit ours = git.commit().setAll(true)
.setMessage("ours").call();
git.checkout().setCreateBranch(true).setStartPoint(first)
.setName("theirs").call();
deleteTrashFile("file");
writeTrashFile("file/file", "in subdir");
git.add().addFilepattern("file/file").call();
RevCommit theirs = git.commit().setAll(true)
.setMessage("theirs").call();
// Exercise inCore flavor of the merge.
try (ObjectInserter ins = db.newObjectInserter()) {
ResolveMerger merger =
(ResolveMerger) strategy.newMerger(ins, db.getConfig());
boolean success = merger.merge(ours, theirs);
assertTrue(success);
assertTrue(merger.getModifiedFiles().isEmpty());
}
}
/**
* Merging after criss-cross merges. In this case we merge together two
* commits which have two equally good common ancestors