> -----Original Message----- > From: pbu...@apache.org [mailto:pbu...@apache.org] > Sent: woensdag 9 januari 2013 23:04 > To: comm...@subversion.apache.org > Subject: svn commit: r1431114 - /subversion/trunk/subversion/svn/merge- > cmd.c > > Author: pburba > Date: Wed Jan 9 22:04:24 2013 > New Revision: 1431114 > > URL: http://svn.apache.org/viewvc?rev=1431114&view=rev > Log: > Fix issue #4139 'Subversion cannot perform merge if there's a file with > the same name as directory'. > > * subversion/svn/merge-cmd.c > (svn_cl__merge): If the basename of the source is the same as the > basename of the current working directory, then assume the cwd is the > target.
I never heard of and/or noticed this behavior
Should we also apply something like this patch to make sure that this
'guessing' is disabled if the user adds an explicit "." as last argument?
The argument normalization functions would normalize the dot to "", which
triggers this guessing behavior of where to apply, while I would say the user
clearly provided the current directory as target.
[[
* subversion/svn/merge.c
(svn_cl__merge): Only guess the intended target if the user didn't provide a
target, instead of also when the target is . or the empty string.
]]
Bert
merge-explicit.patch
Description: Binary data
