Ha! Told you those "revision 1" values were funny-looking.
On Wed, Oct 21, 2009 at 10:59, Stefan Sperling <stsp_at_elego.de> wrote:
> Author: stsp
> Date: Wed Oct 21 07:59:10 2009
> New Revision: 40150
>
> Log:
> Follow-up to r40126:
>
> * subversion/libsvn_wc/diff.c
> (report_wc_file_as_added): Initialising a revnum_t with a value of a
> db_kind_t is a bad idea.
>
> * subversion/tests/cmdline/diff_tests.py
> (diff_schedule_delete, diff_repos_working_added_dir): Adjust expected
> output again.
>
> Modified:
> trunk/subversion/libsvn_wc/diff.c
> trunk/subversion/tests/cmdline/diff_tests.py
>
> Modified: trunk/subversion/libsvn_wc/diff.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/diff.c?pathrev=40150&r1=40149&r2=40150
> ==============================================================================
> --- trunk/subversion/libsvn_wc/diff.c Wed Oct 21 07:37:05 2009 (r40149)
> +++ trunk/subversion/libsvn_wc/diff.c Wed Oct 21 07:59:10 2009 (r40150)
> @@ -939,7 +939,7 @@ report_wc_file_as_added(struct dir_baton
>
> SVN_ERR(get_empty_file(eb, &empty_file));
>
> - SVN_ERR(svn_wc__db_read_info(&status, &revision, NULL, NULL, NULL, NULL,
> + SVN_ERR(svn_wc__db_read_info(&status, NULL, &revision, NULL, NULL, NULL,
> NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> NULL, NULL, NULL, NULL, NULL, NULL, NULL,
> NULL, NULL, NULL, NULL, eb->db, local_abspath,
>
> Modified: trunk/subversion/tests/cmdline/diff_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/diff_tests.py?pathrev=40150&r1=40149&r2=40150
> ==============================================================================
> --- trunk/subversion/tests/cmdline/diff_tests.py Wed Oct 21 07:37:05 2009 (r40149)
> +++ trunk/subversion/tests/cmdline/diff_tests.py Wed Oct 21 07:59:10 2009 (r40150)
> @@ -1989,7 +1989,7 @@ def diff_schedule_delete(sbox):
> ]
>
> expected_output_r1_base = make_diff_header("foo", "revision 0",
> - "revision 1") + [
> + "working copy") + [
> "@@ -0,0 +1,2 @@\n",
> "+xxx\n",
> "+yyy\n"
> @@ -2222,11 +2222,11 @@ def diff_repos_wc_add_with_props(sbox):
> ]
>
> diff_foo_r1_base = make_diff_header("foo", "revision 0",
> - "revision 1") + diff_foo
> + "revision 3") + diff_foo
> diff_foo_base_r3 = make_diff_header("foo", "revision 0",
> "revision 3") + diff_foo
> diff_X_bar_r1_base = make_diff_header("X/bar", "revision 0",
> - "revision 1") + diff_X_bar
> + "revision 3") + diff_X_bar
> diff_X_bar_base_r3 = make_diff_header("X/bar", "revision 0",
> "revision 3") + diff_X_bar
>
> @@ -2310,11 +2310,11 @@ def diff_repos_working_added_dir(sbox):
> sbox.build()
>
> expected_output_r1_BASE = make_diff_header("X/bar", "revision 0",
> - "revision 1") + [
> + "revision 2") + [
> "@@ -0,0 +1 @@\n",
> "+content\n" ]
> expected_output_r1_WORKING = make_diff_header("X/bar", "revision 0",
> - "revision 1") + [
> + "revision 2") + [
> "@@ -0,0 +1,2 @@\n",
> "+content\n",
> "+more content\n" ]
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2409820
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2409896
Received on 2009-10-21 20:40:44 CEST