Today in IRC:
<lisppaste4> markphip pasted "pburba: can you take a look?" at
http://paste.lisp.org/display/61097:
CMD: svnadmin create svn-test-work/repositories/merge_tests-93
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 0.466890>
CMD: svnadmin dump "svn-test-work/local_tmp/repos" | svnadmin load
"svn-test-work/repositories/merge_tests-93" --ignore-uuid <TIME =
0.007359>
CMD: svn co file:///Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-93
svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.908341>
CMD: svn cp svn-test-work/working_copies/merge_tests-93/A
svn-test-work/working_copies/merge_tests-93/A_copy --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.543795>
CMD: svn ci -m "r2 - Copy A to A_copy."
svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.310104>
CMD: svn up svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.252772>
CMD: svn ci -m "r3 - Edit A_copy/mu."
svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.299434>
CMD: svn up svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.216101>
CMD: svn cp svn-test-work/working_copies/merge_tests-93/A_copy
svn-test-work/working_copies/merge_tests-93/A_copy2 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.468717>
CMD: svn ci -m "r4 - Copy A_copy to A_copy2."
svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.226357>
CMD: svn up svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.134394>
CMD: svn ci -m "r5 - Edit A_copy2/mu."
svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.127076>
CMD: svn up svn-test-work/working_copies/merge_tests-93 --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.150355>
CMD: svn merge -c5
file:///Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-93/A_copy2/mu
working_copies/merge_tests-93/A_copy/mu --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.210680>
CMD: svn pl -v working_copies/merge_tests-93/A_copy/mu --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.086746>
CMD: svn merge file:///Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-93/A_copy2
working_copies/merge_tests-93/A_copy --dry-run --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.143916>
CMD: svn merge file:///Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-93/A_copy2
working_copies/merge_tests-93/A_copy --config-dir
/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom <TIME =
0.148312>
=============================================================
Expected '__SVN_ROOT_NODE' and actual '__SVN_ROOT_NODE' in output tree
are different!
=============================================================
EXPECTED NODE TO BE:
=============================================================
* Node name: __SVN_ROOT_NODE
Path: __SVN_ROOT_NODE
Contents: None
Properties: {}
Attributes: {}
Children: N/A (node is a file)
=============================================================
ACTUAL NODE FOUND:
=============================================================
* Node name: __SVN_ROOT_NODE
Path: __SVN_ROOT_NODE
Contents: N/A (node is a directory)
Properties: {}
Attributes: {}
Children: 1
Unequal Types: one Node is a file, the other is a directory
EXCEPTION: SVNTreeUnequal
Traceback (most recent call last):
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/main.py",
line 1074, in run
rc = apply(self.pred.run, (), kw)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 203, in run
return self.test_case.run(sandbox=sandbox)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
return self.func(sandbox)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/merge_tests.py",
line 11151, in dont_explicitly_record_implicit_mergeinfo
None, None, None, None, None, 1)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 634, in run_and_verify_merge
b_baton, check_props, dry_run)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 751, in run_and_verify_merge2
check_props)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/actions.py",
line 513, in verify_update
tree.compare_trees ("output", actual_output, output_tree)
File "/Users/mphippard/work/svn-1.5.x/subversion/tests/cmdline/svntest/tree.py",
line 542, in compare_trees
raise SVNTreeUnequal
SVNTreeUnequal
FAIL: merge_tests.py 93: don't explicitly record implicit mergeinfo
END: merge_tests.py
<pburba> looking
<markphip> I am looking at issue #3157 group
<markphip> maybe I did not resolve test conflicts right, but it looks
like the test ran and just failed
Mark,
I found the problem. r30748 was never backported (in hindsight I
should have nominated it long ago) and without it that test fails.
See r31347 on 1.5.x.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-22 00:04:18 CEST