> -----Original Message-----
> From: i...@apache.org [mailto:i...@apache.org]
> Sent: vrijdag 27 juni 2014 20:45
> To: comm...@subversion.apache.org
> Subject: svn commit: r1606182 - in /subversion/trunk/subversion: svn/
> tests/cmdline/
>
> Author: ivan
> Date: Fri Jun 27 18:44:51 2014
> New Revision: 1606182
>
> URL: http://svn.apache.org/r1606182
> Log:
> Follow-up to r1604179: Print "Committing transaction" progress notification
> for tree changes only commits.
>
> Found by: julianfoad
I don't understand why (yet), but this patch breaks quite a few tests on most
buildbots.
The pattern I don't understand is:
[[[
W: EXPECTED STDOUT:
W: | Committing transaction...
W: | Committed revision 4.
W: ACTUAL STDOUT:
W: | Committing transaction...
W: | Committed revision 4.
W: DIFF STDOUT:
W: | --- EXPECTED STDOUT
W: | +++ ACTUAL STDOUT
W: | @@ -1,2 +1,2 @@
W: | -Committing transaction...
W: | +Committing transaction...
W: | Committed revision 4.
W: CWD: E:\svn-local\tests\subversion\tests\cmdline
W: EXCEPTION: SVNLineUnequal
Traceback (most recent call last):
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\main.py",
line 1621, in run
rc = self.pred.run(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\testcase.py",
line 254, in run
return self._delegate.run(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\testcase.py",
line 176, in run
return self.func(sandbox)
File "D:\local\svn-local\build\subversion\tests\cmdline\merge_tests.py", line
8156, in merge_old_and_new_revs_from_renamed_file
mu_url, mu_MOVED_url)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\actions.py",
line 284, in run_and_verify_svn
expected_exit, *varargs)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\actions.py",
line 323, in run_and_verify_svn2
verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\verify.py",
line 452, in verify_outputs
compare_and_display_lines(message, label, expected, actual, raisable)
File "D:\local\svn-local\build\subversion\tests\cmdline\svntest\verify.py",
line 425, in compare_and_display_lines
raise raisable
SVNLineUnequal
FAIL: merge_tests.py 59: merge -rold(before rename):head renamed file
]]]
The expected and actual output appear to be identical here.
If we are going to fix these cases anyway I would prefer an additional patch
like
[[
Index: subversion/svn/notify.c
===================================================================
--- subversion/svn/notify.c (revision 1606560)
+++ subversion/svn/notify.c (working copy)
@@ -1061,7 +1061,7 @@ notify_body(struct notify_baton *nb,
{
SVN_ERR(svn_cmdline_printf(pool, _("done\n")));
}
- SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...")));
+ SVN_ERR(svn_cmdline_printf(pool, _("Committing transaction...\n")));
break;
default:
Index: subversion/svn/util.c
===================================================================
--- subversion/svn/util.c (revision 1606560)
+++ subversion/svn/util.c (working copy)
@@ -76,7 +76,7 @@ svn_cl__print_commit_info(const svn_commit_info_t
apr_pool_t *pool)
{
if (SVN_IS_VALID_REVNUM(commit_info->revision))
- SVN_ERR(svn_cmdline_printf(pool, _("\nCommitted revision %ld%s.\n"),
+ SVN_ERR(svn_cmdline_printf(pool, _("Committed revision %ld%s.\n"),
commit_info->revision,
commit_info->revision == 42 &&
getenv("SVN_I_LOVE_PANGALACTIC_GARGLE_BLASTERS")
]]
To remove the magic coupling of the EOL handling between these two functions.
(This will need additional test fixups to remove several empty lines that we
expect in older cases)
Bert
