You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Neels Janosch Hofmeyr <ne...@elego.de> on 2008/08/20 22:05:03 UTC
[PATCH] cosmetic: missing separator line in merge_tests.py
[[[
* subversion/tests/cmdline/merge_tests.py: Add missing separator line.
]]]
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):
--
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Karl Fogel <kf...@red-bean.com>.
Neels Janosch Hofmeyr <ne...@elego.de> writes:
> I think I made this diff by running `svn diff` in the working copy root and
> then *N*X-style copy-pasting terminal output to thunderbird (middle mouse
> button).
Attaching as mime-type "text/plain" is never wrong, too :-).
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Neels Janosch Hofmeyr <ne...@elego.de>.
Senthil Kumaran S wrote:
> Karl Fogel wrote:
>> Anyway, committed in r32611 -- it was pretty easy to figure out what
>> that patch was trying to do, and then just do it manually :-).
>
> Yes I thought of doing that manually, but would like to notify Neels
> that something was wrong with the patch, before I correct it.
>
> Thank You.
Hey guys,
sorry for causing all that fuzz with a single line of diff.
I think I made this diff by running `svn diff` in the working copy root and
then *N*X-style copy-pasting terminal output to thunderbird (middle mouse
button).
On another similar diff, which is also broken, Daniel Shahaf said "The patch
is broken, your mailer ate the whitespace" (tree-conflicts branch).
I'll pay closer attention in future...
Thanks!
Neels
--
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Senthil Kumaran S <se...@collab.net>.
Karl Fogel wrote:
> Anyway, committed in r32611 -- it was pretty easy to figure out what
> that patch was trying to do, and then just do it manually :-).
Yes I thought of doing that manually, but would like to notify Neels that
something was wrong with the patch, before I correct it.
Thank You.
--
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Karl Fogel <kf...@red-bean.com>.
Senthil Kumaran S <se...@collab.net> writes:
> I had the patch with log message at the top, thats why it is pointing
> to the 12th line, else it will point to the 7th line.
Yeah, there is something wrong with his patch; the added line count in
the header seems wrong, for one thing. Neels, how did you produce that
patch?
Anyway, committed in r32611 -- it was pretty easy to figure out what
that patch was trying to do, and then just do it manually :-).
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Senthil Kumaran S <se...@collab.net>.
Karl Fogel wrote:
>> Please include the "Patch by:" clause in the log message.
>
> (Though note that we can always insert that, it's no big deal...)
Ok.
> 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.)
I had the patch with log message at the top, thats why it is pointing to the
12th line, else it will point to the 7th line.
<snip>
patching file subversion/tests/cmdline/merge_tests.py
patch: **** malformed patch at line 7: os.chdir(saved_cwd)
</snip>
> 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.
Attached.
--
Senthil Kumaran S
http://www.stylesen.org/
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Karl Fogel <kf...@red-bean.com>.
Senthil Kumaran S <se...@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] cosmetic: missing separator line in merge_tests.py
Posted by Senthil Kumaran S <se...@collab.net>.
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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org