Thanks Philip - I've checked and I think that was it. I've re-run it with the
recent head of the trunk and it's now fine.
Ben
"Fitzpatrick, Ben" 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 sp
Hi everyone,
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. That tree conflict can be caused by
adding a file with a particular name on one branch, co
