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

Re: Tree Conflicts with Subversion 1.7

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 18 Aug 2011 17:06:24 +0200

On Thu, Aug 18, 2011 at 04:54:15PM +0200, Markus Schaber wrote:
> Hi,
>
> Can Subversion 1.7 still have tree conflicts?

Yes. Nothing much has changed on that front for 1.7.
Foundations for some bigger changes in tree-conflict behaviour planned
for 1.8 and later are already being worked on.

> Or can the new working copy break them down to individual conflicts on
> files (and directory properties)?

Not sure what you mean here. Can you provide an example?
Received on 2011-08-18 17:07:06 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.