Markus Schaber wrote on Thu, Aug 18, 2011 at 17:30:59 +0200: > Hi, > > > Von: Stefan Sperling [mailto:s...@elego.de] > > 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? > > My idea was that directories itsself would never conflict. If there's a > directory removed, and a new one created with the same name, it is the > same directory, so no tree conflict. If the directories have different > properties, then those properties conflict, and if they have conflicting > files, then those files conflict individually. But no tree conflict. > > But maybe my thought is a little bit to short.
What copyfrom would the single directory have, in the case of an add/add conflict? % svn mkdir A; svn ci -m r1 % svn rm A; svn ci -m r2 % svn mkdir A % svn merge -c1 ./
