Re: [PATCH] cosmetic: missing separator line in merge_tests.py

Neels Janosch Hofmeyr wrote:
> [[[
> * subversion/tests/cmdline/merge_tests.py: Add missing separator line.
> ]]]

Please include the "Patch by:" clause in the log message.

> Index: subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- subversion/tests/cmdline/merge_tests.py (revision 32608)
> +++ subversion/tests/cmdline/merge_tests.py (working copy)
> @@ -12504,6 +12504,7 @@
> None, None, None, None, None, 1)
> os.chdir(saved_cwd)
>
> +#----------------------------------------------------------------------
> # Test for issue #3240 'commits to subtrees added by merge
> # corrupt working copy and repos'.
> def commit_to_subtree_added_by_merge(sbox):

The above patch does not apply cleanly on the trunk at r32610.

<snip>
patching file subversion/tests/cmdline/merge_tests.py
patch: **** malformed patch at line 12: os.chdir(saved_cwd)
</snip>

Thank You.

-- 
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org