Hi, Stefan, Von: Stefan Sperling [mailto:s...@elego.de]
> As given your example is a bit hard to follow because there are multi-layer > operations involved. I am not sure how to interpret the replacement. What did > the directory look like before it was replaced? > Is this during merge or update? > Can you describe in detail how the tree conflict came about? I tried to create a self-contained example, but it seems that, in those examples, the conflict comes out differently, I cannot get the tree conflict to appear. I'll send more detail if I know how to reconstruct that sample with plain SVN. 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.scha...@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
