You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/05/18 23:41:17 UTC
svn commit: r945903 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Tue May 18 21:41:17 2010
New Revision: 945903
URL: http://svn.apache.org/viewvc?rev=945903&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py:
(basic_reintegrate): Show the right command and error in the comment.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=945903&r1=945902&r2=945903&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue May 18 21:41:17 2010
@@ -10611,20 +10611,20 @@ def basic_reintegrate(sbox):
expected_skip = wc.State(A_MOVED_path, {})
# This test is currently marked as XFail as the reintegrate fails:
#
- # merge_tests-77>svn merge ^/A_COPY A --reintegrate
- # ..\..\..\subversion\svn\merge-cmd.c:70: (apr_err=155010)
- # ..\..\..\subversion\svn\util.c:1118: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\cmdline.c:269: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\cmdline.c:132: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\util.c:270: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\ra.c:430: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\url.c:106: (apr_err=155010)
- # ..\..\..\subversion\libsvn_client\url.c:151: (apr_err=155010)
- # ..\..\..\subversion\libsvn_wc\node.c:432: (apr_err=155010)
- # ..\..\..\subversion\libsvn_wc\wc_db.c:4678: (apr_err=155010)
- # ..\..\..\subversion\libsvn_wc\wc_db.c:4670: (apr_err=155010)
- # svn: The node 'C:\SVN\src-trunk\Debug\subversion\tests\cmdline\
- # svn-test-work\working_copies\merge_tests-77\A' was not found.
+ # >svn merge ^^/A_COPY A_MOVED --reintegrate
+ # ..\..\..\subversion\svn\merge-cmd.c:358: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\merge.c:9777: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\merge.c:9747: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\merge.c:9654: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\ra.c:753: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\mergeinfo.c:740: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_client\ra.c:548: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_repos\rev_hunt.c:908: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_repos\rev_hunt.c:607: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_fs_fs\tree.c:2883: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_fs_fs\tree.c:2883: (apr_err=160013)
+ # ..\..\..\subversion\libsvn_fs_fs\tree.c:667: (apr_err=160013)
+ # svn: File not found: revision 7, path '/A_MOVED'
svntest.actions.run_and_verify_merge(A_MOVED_path, None, None,
sbox.repo_url + '/A_COPY', None,
expected_output,