Re: svn diff - revert - patch does not restore wc state

working copy state. Cheers, Timur пт, 7 сент. 2018 г. в 13:42, Stefan Sperling : > On Fri, Sep 07, 2018 at 01:18:08PM +0300, Timur Khanipov wrote: > > Hi, folks. > > > > I have successfully used Subversion for many years and in general I am > > happy with it, so I

svn diff - revert - patch does not restore wc state

avior contradicts the principle of least astonishment, there is no way (by supplying specific flags to `svn diff/patch`) of making Subversion save the full change and restore it. This is at least disappointing. Are there any plans to tackle this issue? Regards, Timur Khanipov P.S. I am using Subversion version 1.10.0, r1827917.

Two-step merge ok, one-step merge conflicts

Hi folks. I faced the following problem. The command svn merge -r 3:4 -r 4:5 ^^/trunk works smoothly while command svn merge -r 3:5 ^^/trunk results in a text conflict. This seems like a buggy behavior (since the two merges are equivalent). I reproduced it in a simple situation when trunk con