Examples with SvnChangeList org.jetbrains.idea.svn.history.SvnChangeList used on opensource projects

Example 36 with SvnChangeList

use of org.jetbrains.idea.svn.history.SvnChangeList in project intellij-community by JetBrains.

the class SvnMergeInfoTest method testWhenInfoInRepo.

@Test
public void testWhenInfoInRepo() throws Exception {
    final File fullBranch = newFolder(myTempDirFixture.getTempDirPath(), "fullBranch");
    createTwoFolderStructure(fullBranch);
    // folder1 will be taken as branch wc root
    checkOutFile(myBranchUrl + "/folder/folder1", myBranchVcsRoot);
    // rev 3 : f2 changed
    editAndCommit(trunk, f2);
    // rev 4: record as merged into branch using full branch WC
    recordMerge(fullBranch, myTrunkUrl, "-c", "3");
    commitFile(fullBranch);
    updateFile(myBranchVcsRoot);
    final List<SvnChangeList> changeListList = getTrunkChangeLists();
    assertRevisions(changeListList, 3);
    assertMergeResult(changeListList.get(0), SvnMergeInfoCache.MergeCheckResult.MERGED);
}

Example 37 with SvnChangeList

use of org.jetbrains.idea.svn.history.SvnChangeList in project intellij-community by JetBrains.

the class SvnMergeInfoTest method testMixedWorkingRevisions.

@Test
public void testMixedWorkingRevisions() throws Exception {
    createOneFolderStructure();
    // rev 3
    editAndCommit(trunk, f1);
    // rev 4: record non inheritable merge
    setMergeInfo(myBranchVcsRoot, "/trunk:3");
    commitFile(myBranchVcsRoot);
    // ! no update!
    assertMergeInfo(myBranchVcsRoot, "/trunk:3");
    final Info f1info = myVcs.getInfo(new File(myBranchVcsRoot, "folder/f1.txt"));
    assert f1info.getRevision().getNumber() == 2;
    final List<SvnChangeList> changeListList = getTrunkChangeLists();
    final SvnChangeList changeList = changeListList.get(0);
    assertMergeResult(changeList, SvnMergeInfoCache.MergeCheckResult.NOT_MERGED);
    // and after update
    updateFile(myBranchVcsRoot);
    myMergeChecker.clear();
    assertMergeResult(changeList, SvnMergeInfoCache.MergeCheckResult.MERGED);
}