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

Chris wrote:
> I shelved a bunch of
> files and noticed that some of those files were still marked as
> modified and when I did diff on them I got something like this:
>
>---somefile.txt (rev 123456)
>+++somefile.txt (working copy)
>-sometext
>\ No newline at end of file
>+sometext

Assuming you saw that with v1.10, that's another deficiency of building shelving on top of diff and patch.

For the version coming in 1.11 I've completely changed the implementation (it doesn't use diff/patch any more) and I'm pretty sure bugs of that kind are gone. Please let me know if you see anything like that when you first get a chance to try a recent trunk build or 1.11.

Thanks.

- Julian
Received on 2018-09-11 16:20:04 CEST