"Fitzpatrick, Ben" <ben.fitzpatr...@metoffice.gov.uk> writes:
> Using Subversion 1.8.1 on Linux (RHEL6), a merge that creates a "local > file obstruction, incoming file add upon merge" file tree conflict > will break svn info on the root of the working copy. I believe this will be fixed by 1.8.3, from CHANGES: * info: fix spurious error on wc root with child in conflict (r1515366) -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*