[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict breaks svn info on root of working copy

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 29 Aug 2013 16:01:00 +0100

"Fitzpatrick, Ben" <ben.fitzpatrick_at_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*
Received on 2013-08-29 17:01:40 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.