subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Markus Schaber <>
Subject RE: new svn conflict resolver status update
Date Wed, 15 Jun 2016 06:56:56 GMT

> -----Original Message-----
> From: Johan Corveleyn []
> Sent: Tuesday, June 14, 2016 10:15 PM
> To: Johan Corveleyn; Subversion Development
> Subject: Re: new svn conflict resolver status update
> On Mon, Jun 13, 2016 at 12:50 PM, Stefan Sperling <> wrote:
> > On Mon, Jun 13, 2016 at 12:05:27AM +0200, Johan Corveleyn wrote:
> >> To be honest, being able to use the python test framework would be a
> >> lot more productive for me. Maybe I can look into how to make it
> >> handle interactive prompting? Unless there's a reason why this would
> >> be notoriously difficult to implement?
> >
> > One reason which makes this difficult is that 'svn status' and 'svn info'
> > do not show the new conflict descriptions. They still show the same
> > data as they did in 1.9. This allows me to avoid updating test
> > expectations for a ton of existing python tests.
> Ah okay. I suppose 'svn status' and 'svn info' will show the new conflict
> descriptions eventually, but just not right now, and that this might be a
> moving target (the exact wording etc.) for a while.
> Okay, that may make it difficult to program tests against.

Maybe we could provide a way for the tests to read the description strings
for each situation, so the test can adapt to different descriptions?

Best regards

Markus Schaber

CODESYS® a trademark of 3S-Smart Software Solutions GmbH

Inspiring Automation Solutions

3S-Smart Software Solutions GmbH
Dipl.-Inf. Markus Schaber | Product Development Core Technology
Memminger Str. 151 | 87439 Kempten | Germany
Tel. +49-831-54031-979 | Fax +49-831-54031-50

E-Mail: | Web: | CODESYS store:
CODESYS forum:

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten
HRB 6186 | Tax ID No.: DE 167014915

This e-mail may contain confidential and/or privileged information. If you are not the intended
recipient (or have received
this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorised
copying, disclosure
or distribution of the material in this e-mail is strictly forbidden.
View raw message