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

AW: Problem with reverting

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Thu, 2 Feb 2012 11:32:43 +0000

Hi, Stefan,

Von: Stefan Sperling [mailto:stsp_at_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.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 2012-02-02 12:33:20 CET

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.