@Issue(3020)
def dont_drop_valid_mergeinfo_during_incremental_loads(sbox):
    "don't filter mergeinfo revs from incremental dump"
    sbox.build(empty=True)
    dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', 'mergeinfo_included_full.dump')
    dumpfile_full = svntest.actions.load_dumpfile(dumpfile_location)
    load_dumpstream(sbox, dumpfile_full, '--ignore-uuid')
    url = (sbox.repo_url + '/branches/')
    expected_output = svntest.verify.UnorderedOutput([(url + 'B1 - /branches/B2:11-12\n'), '/trunk:6,9\n', (url + 'B2 - /trunk:9\n'), (url + 'B1/B/E - /branches/B2/B/E:11-12\n'), '/trunk/B/E:5-6,8-9\n'])
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    dump_file_r1_10 = sbox.get_tempname('r1-10-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '-r1:10')
    dump_fp = open(dump_file_r1_10, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    dump_file_r11_13 = sbox.get_tempname('r11-13-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '--incremental', '-r11:13')
    dump_fp = open(dump_file_r11_13, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    dump_file_r14_15 = sbox.get_tempname('r14-15-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '--incremental', '-r14:15')
    dump_fp = open(dump_file_r14_15, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    sbox.build(empty=True)
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r1_10), '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r11_13), '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r14_15), '--ignore-uuid')
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    sbox.build(empty=True)
    dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', 'skeleton_repos.dump')
    dumpfile_skeleton = svntest.actions.load_dumpfile(dumpfile_location)
    load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
    load_dumpstream(sbox, dumpfile_full, '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    url = (sbox.repo_url + '/Projects/Project-X/branches/')
    expected_output = svntest.verify.UnorderedOutput([(url + 'B1 - /Projects/Project-X/branches/B2:17-18\n'), '/Projects/Project-X/trunk:12,15\n', (url + 'B2 - /Projects/Project-X/trunk:15\n'), (url + 'B1/B/E - /Projects/Project-X/branches/B2/B/E:17-18\n'), '/Projects/Project-X/trunk/B/E:11-12,14-15\n'])
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    sbox.build(empty=True)
    load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r1_10), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r11_13), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r14_15), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
don't filter mergeinfo revs from incremental dump
@Issue(3020)
def dont_drop_valid_mergeinfo_during_incremental_loads(sbox):
    
    sbox.build(empty=True)
    dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', 'mergeinfo_included_full.dump')
    dumpfile_full = svntest.actions.load_dumpfile(dumpfile_location)
    load_dumpstream(sbox, dumpfile_full, '--ignore-uuid')
    url = (sbox.repo_url + '/branches/')
    expected_output = svntest.verify.UnorderedOutput([(url + 'B1 - /branches/B2:11-12\n'), '/trunk:6,9\n', (url + 'B2 - /trunk:9\n'), (url + 'B1/B/E - /branches/B2/B/E:11-12\n'), '/trunk/B/E:5-6,8-9\n'])
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    dump_file_r1_10 = sbox.get_tempname('r1-10-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '-r1:10')
    dump_fp = open(dump_file_r1_10, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    dump_file_r11_13 = sbox.get_tempname('r11-13-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '--incremental', '-r11:13')
    dump_fp = open(dump_file_r11_13, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    dump_file_r14_15 = sbox.get_tempname('r14-15-dump')
    (exit_code, output, errput) = svntest.main.run_svnadmin('dump', sbox.repo_dir, '--incremental', '-r14:15')
    dump_fp = open(dump_file_r14_15, 'wb')
    dump_fp.writelines(output)
    dump_fp.close()
    sbox.build(empty=True)
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r1_10), '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r11_13), '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r14_15), '--ignore-uuid')
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    sbox.build(empty=True)
    dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', 'skeleton_repos.dump')
    dumpfile_skeleton = svntest.actions.load_dumpfile(dumpfile_location)
    load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
    load_dumpstream(sbox, dumpfile_full, '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    url = (sbox.repo_url + '/Projects/Project-X/branches/')
    expected_output = svntest.verify.UnorderedOutput([(url + 'B1 - /Projects/Project-X/branches/B2:17-18\n'), '/Projects/Project-X/trunk:12,15\n', (url + 'B2 - /Projects/Project-X/trunk:15\n'), (url + 'B1/B/E - /Projects/Project-X/branches/B2/B/E:17-18\n'), '/Projects/Project-X/trunk/B/E:11-12,14-15\n'])
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)
    sbox.build(empty=True)
    load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r1_10), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r11_13), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    load_dumpstream(sbox, svntest.actions.load_dumpfile(dump_file_r14_15), '--parent-dir', 'Projects/Project-X', '--ignore-uuid')
    svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url)