You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/03/27 15:23:47 UTC
svn commit: r1461603 -
/subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c
Author: stsp
Date: Wed Mar 27 14:23:47 2013
New Revision: 1461603
URL: http://svn.apache.org/r1461603
Log:
On the 1.7.x-issue4340 branch, fix a cosmetic conflict resolution error.
* subversion/tests/libsvn_fs/fs-test.c
(filename_trailing_newline): Remove misplaced comment within this function.
The comment is supposed to separate tests in this file from the test list.
Modified:
subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c
Modified: subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c?rev=1461603&r1=1461602&r2=1461603&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/1.7.x-issue4340/subversion/tests/libsvn_fs/fs-test.c Wed Mar 27 14:23:47 2013
@@ -4814,7 +4814,6 @@ filename_trailing_newline(const svn_test
SVN_ERR(svn_test__create_fs(&fs, "test-filename-trailing-newline",
opts, pool));
-/* ------------------------------------------------------------------------ */
/* Revision 1: Add a directory /foo */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));