Re: [PATCH] svn: Attempted to get textual contents of a *non*-file node
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 7 Mar 2012 10:07:24 +0000 (GMT)
Daniel Shahaf wrote:
> Thanks for the patch Alexey. Forwarding it to dev@.
>> I confirm it works when dir and file do not have the same name.
>> $ svn merge -c 4 ^/trunk/foo .
This all happens because of a special case that was inserted long ago.
r845404: Resolve issue #785.
* merge-cmd.c (svn_cl__merge): If no target path was specified, try to
The help text is now only present in the "4. This form is called a '2-URL merge'" section:
"If TARGET_WCPATH is omitted, a default value of '.' is assumed.
... but the code applies more widely, and also it doesn't check that the sources are files, only that the target is a file.
Seems we need to make the code more stringent (check sources are files) and fix the help text. Then the special-case code would only kick in when it makes sense: when the sources are files and the target is a WC directory containing a file of that name.
>> Issue 4139 created. Attached is a patch that adds an XFail to the test
This is an archived mail posted to the Subversion Dev mailing list.