Hi,
Von: Stefan Sperling [mailto:stsp_at_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.
Best regards
Markus Schaber
___________________________
We software Automation.
3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 |
Fax +49-831-54031-50
Email: m.schaber@3s-software.com | Web: http://www.3s-software.com
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects:
http://www.3s-software.com/index.shtml?sample_projects
Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner |
Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Received on 2011-08-18 17:31:46 CEST