Charles,
Nice patch! To complete it, can you include a 'Approved by: kfogel' line
in your log message?
(see http://subversion.tigris.org/hacking.html#commit-access).
thanks,
Lieven
cacknin@tigris.org wrote:
> Author: cacknin
> Date: Tue Oct 23 08:12:27 2007
> New Revision: 27324
>
> Log:
> Add a non-regression diff test against bug that r26503 fixes. (see
> http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=129865)
>
> * subversion/tests/cmdline/diff_tests.py
> (diff_backward_repos_wc_copy): new test for backward repos->wc diff
> against copied-file.
> (test_list): add this new test.
>
>
> Modified:
> trunk/subversion/tests/cmdline/diff_tests.py
>
> Modified: trunk/subversion/tests/cmdline/diff_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/diff_tests.py?pathrev=27324&r1=27323&r2=27324
> ==============================================================================
> --- trunk/subversion/tests/cmdline/diff_tests.py (original)
> +++ trunk/subversion/tests/cmdline/diff_tests.py Tue Oct 23 08:12:27 2007
> @@ -3334,6 +3334,36 @@
> 'diff', '-x', '--ignore-eol-style',
> file_path)
>
> +def diff_backward_repos_wc_copy(sbox):
> + "backward repos->wc diff with copied file"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
> + os.chdir(wc_dir)
> +
> + # copy a file
> + mu_path = os.path.join('A', 'mu')
> + mucp_path = os.path.join('A', 'mucopy')
> + svntest.main.run_svn(None, 'cp', mu_path, mucp_path)
> +
> + # commit r2 and update back to r1
> + svntest.main.run_svn(None, 'ci', '-m', 'log msg')
> + svntest.main.run_svn(None, 'up', '-r1')
> +
> + # diff r2 against working copy
> + diff_repos_wc = [
> + "Index: A/mucopy\n",
> + "===================================================================\n",
> + "--- A/mucopy\t(revision 2)\n",
> + "+++ A/mucopy\t(working copy)\n",
> + "@@ -1 +0,0 @@\n",
> + "-This is the file 'mu'.\n",
> + ]
> +
> + svntest.actions.run_and_verify_svn(None, diff_repos_wc, [],
> + 'diff', '-r' , '2')
> +
> +
> ########################################################################
> #Run the tests
>
> @@ -3383,6 +3413,7 @@
> diff_in_renamed_folder,
> diff_with_depth,
> diff_ignore_eolstyle_empty_lines,
> + diff_backward_repos_wc_copy,
> ]
>
> if __name__ == '__main__':
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 23 20:23:14 2007