On Thu, Nov 6, 2008 at 8:23 PM, <pburba_at_tigris.org> wrote:
> Author: pburba
> Date: Thu Nov 6 17:23:51 2008
> New Revision: 34091
>
> Log:
> Reintegrate the reintegrate-improvements branch back to trunk.
>
> Modified:
> trunk/ (props changed)
> trunk/build.conf (props changed)
> trunk/notes/tree-conflicts/design-overview.txt (props changed)
> trunk/notes/tree-conflicts/requirements.txt (props changed)
> trunk/subversion/include/ (props changed)
> trunk/subversion/include/private/svn_auth_private.h (props changed)
> trunk/subversion/include/private/svn_cache.h (props changed)
> trunk/subversion/include/private/svn_mergeinfo_private.h
> trunk/subversion/include/svn_mergeinfo.h
> trunk/subversion/libsvn_auth_kwallet/kwallet.cpp (props changed)
> trunk/subversion/libsvn_client/merge.c
> trunk/subversion/libsvn_subr/ (props changed)
> trunk/subversion/libsvn_subr/mergeinfo.c
> trunk/subversion/tests/cmdline/merge_tests.py
> trunk/subversion/tests/cmdline/tree_conflict_tests.txt (props changed)
> trunk/subversion/tests/libsvn_subr/ (props changed)
> trunk/tools/buildbot/slaves/win32-xp-VS2005/ (props changed)
> trunk/tools/server-side/svn_server_log_parse.py (props changed)
> trunk/tools/server-side/test_svn_server_log_parse.py (props changed)
> trunk/www/development.html (props changed)
> trunk/www/issue-tracker.html (props changed)
> trunk/www/tasks.html (props changed)
<SNIP>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=34091&r1=34090&r2=34091
> ==============================================================================
> --- trunk/subversion/tests/cmdline/merge_tests.py Thu Nov 6 15:38:15 2008 (r34090)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Thu Nov 6 17:23:51 2008 (r34091)
<SNIP>
> + # Now reintegrate A_COPY back to A. Since A_COPY/D no longer has r8 merged
> + # to it from A, the merge should fail. Further we expect an error message
> + # that highlights the fact that A_COPY/D is the offending subtree.
> + #
> + # The actions.run_and_verify_* methods are happy if one line of the error
> + # matches the regex, but we want to know that the error actually provides
> + # specific information about the paths that are stopping --reintegrate from
> + # working. So we will pass the stderr to svntest.verify.verify_outputs()
> + # ourselves, but as the 'actual_stdout' argument, that way each line of
> + # error must match the regex.
> + exit_code, out, err = svntest.actions.run_and_verify_svn(
> + None, [], svntest.verify.AnyOutput,
> + 'merge', '--reintegrate', sbox.repo_url + '/A_COPY', A_path)
> +
> + svntest.verify.verify_outputs("Reintegrate failed but not "
> + "in the way expected",
> + err, None,
> + "(svn: Reintegrate can only be used if the "
> + "revisions previously merged from the "
> + "reintegrate target to '.*A_COPY' are the "
> + "same, but there are differences:\n)"
> + "|( A_COPY\n)"
> + "|( /A:2-12\n)"
> + "|( A_COPY/D\n)"
> + "|( /A/D:2-7,9-12\n)"
> + "|(\n)",
> + None,
> + True) # Match *all* lines of stdout
Checking the buildbots I see that this test only passes on Windows.
So I'm doing something wrong here with the test expectations, but I'm
unsure what exactly.
Here is the relevant portion of the log from the eh-debsarge1
fsfs+ra_svn log
(http://www.mobsol.be/buildbot/i686-debian-sarge1%20shared%20gcc-3.3.5/builds/1561/step-Test%20fsfs%2Bra_svn/0):
[[[
CMD: svn merge --reintegrate
svn://127.0.0.1:1295/svn-test-work/repositories/merge_tests-126/A_COPY
svn-test-work/working_copies/merge_tests-126/A --config-dir
/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom CMD:
/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/svn/svn
merge --reintegrate
svn://127.0.0.1:1295/svn-test-work/repositories/merge_tests-126/A_COPY
svn-test-work/working_copies/merge_tests-126/A --config-dir
/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svn-test-work/local_tmp/config
--password rayjandom --no-auth-cache --username jrandom exited with 1
<TIME = 0.318826>
subversion/libsvn_client/merge.c:7226: (apr_err=195016)
svn: Reintegrate can only be used if the revisions previously merged
from the reintegrate target to
'svn://127.0.0.1:1295/svn-test-work/repositories/merge_tests-126/A_COPY'
are the same, but there are differences:
A_COPY
/A:2-12
A_COPY/D
/A/D:2-7,9-12
Reintegrate failed but not in the way expected
EXPECTED STDOUT (regexp):
(svn: Reintegrate can only be used if the revisions previously merged
from the reintegrate target to '.*A_COPY' are the same, but there are
differences:
)|( A_COPY
)|( /A:2-12
)|( A_COPY/D
)|( /A/D:2-7,9-12
)|(
)
ACTUAL STDOUT:
subversion/libsvn_client/merge.c:7226: (apr_err=195016)
svn: Reintegrate can only be used if the revisions previously merged
from the reintegrate target to
'svn://127.0.0.1:1295/svn-test-work/repositories/merge_tests-126/A_COPY'
are the same, but there are differences:
A_COPY
/A:2-12
A_COPY/D
/A/D:2-7,9-12
EXCEPTION: SVNUnmatchedError
Traceback (most recent call last):
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svntest/main.py",
line 1133, in run
rc = self.pred.run(**kw)
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svntest/testcase.py",
line 204, in run
return self.test_case.run(sandbox=sandbox)
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svntest/testcase.py",
line 121, in run
return self.func(sandbox)
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/merge_tests.py",
line 14674, in reintegrate_with_subtree_mergeinfo
True) # Match *all* lines of stdout
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svntest/verify.py",
line 333, in verify_outputs
compare_and_display_lines(message, label, expected, actual, raisable)
File "/safer-data/home/erik/buildslave/eh-debsarge1/build/subversion/tests/cmdline/svntest/verify.py",
line 305, in compare_and_display_lines
raise raisable
SVNUnmatchedError
FAIL: merge_tests.py 126: merge --reintegrate with subtree mergeinfo
END: merge_tests.py
]]]
Does anyone understand why the error output is not matching the regex?
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-11-07 15:05:24 CET