On Thu, Aug 5, 2010 at 8:41 AM, <dan...@apache.org> wrote:
> Author: dannas
> Date: Thu Aug 5 12:41:51 2010
> New Revision: 982582
>
> URL: http://svn.apache.org/viewvc?rev=982582&view=rev
> Log:
> Adjust a C-unit test for parsing git diffs to have " b/" as part of
> the paths.
>
> The diff-parser searches for " b/" to find the start of old_path.
>
> * subversion/tests/libsvn_diff/parse-diff-tests.c
> (git_diff_with_spaces_diff,
> test_git_diffs_with_spaces_diff): See above.
>
> Modified:
> subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
>
> Modified: subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c?rev=982582&r1=982581&r2=982582&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c (original)
> +++ subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c Thu Aug
> 5 12:41:51 2010
> @@ -220,9 +220,9 @@ static const char *bad_git_diff_header =
> "new file mode 100644" NL
> "git --diff a/path one 1 b/path one 1" NL
> "new file mode 100644" NL
> - "git --diff a/dir/b/path b/dir/b/path" NL
> + "git --diff a/dir/ b/path b/dir/ b/path" NL
> "new file mode 100644" NL
> - "git --diff a/b/path 1 b/b/path 1" NL
> + "git --diff a/ b/path 1 b/ b/path 1" NL
> "new file mode 100644" NL;
>
>
> @@ -834,8 +834,9 @@ test_git_diffs_with_spaces_diff(apr_pool
> FALSE, /* ignore_whitespace */
> pool, pool));
> SVN_TEST_ASSERT(patch);
> - SVN_TEST_ASSERT(! strcmp(patch->old_filename, "dir/b/path"));
> - SVN_TEST_ASSERT(! strcmp(patch->new_filename, "dir/b/path"));
> + SVN_DBG(("%s\n", patch->old_filename));
^^^^^^^^
Was this intentional? If so, we need to conditionally exclude it so
we can build release configurations:
#ifdef SVN_DEBUG
SVN_DBG(("%s\n", patch->old_filename));
#endif
Paul
