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

Senthil Kumaran S <senthil_at_collab.net> writes:
> Neels Janosch Hofmeyr wrote:
>> [[[
>> * subversion/tests/cmdline/merge_tests.py: Add missing separator line.
>> ]]]
>
> Please include the "Patch by:" clause in the log message.

(Though note that we can always insert that, it's no big deal...)

> 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>

This error does not mean the patch is out of date w.r.t. trunk, it means
there's something wrong with the patch itself. Considering that the
patch does not even have 12 lines, I'm not sure how it manages to be
malformed on line 12 :-). (The "os.chdir" line in the patch is like
line 2 or something -- it's just the second line of context.)

Senthil, can you post the patch file you're working with (as an
attachment of mime type 'text/plain')? We can compare it with Neels'
original post and figure out what happened here, maybe.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-21 07:31:21 CEST