Re: svn 1.3.1 merge bug

"Norbert Unterberg" <nunterberg@gmail.com> writes:

> 2006/5/18, Thomas Börkel <tbo@ap-ag.com>:
>> When a merge brings a new file and this file is already existing, versioned
>> and non-emtpy at the destination wc, the merge command prints "A" as status,
>> but the file is (correctly) conflicted.
>
> I reported this on this list more than a year ago, seems the issue got
> overlooked:
>
> http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=321790

An issue has been open for some time:

http://subversion.tigris.org/issues/show_bug.cgi?id=2397

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org