On Thu, Oct 28, 2021 at 11:15 AM Stefan Sperling <s...@elego.de> wrote: > > On Thu, Oct 28, 2021 at 10:24:55AM -0400, Mark Phippard wrote: > > SVN's design handles renames well from a version control history point > > of view, but it does not handle them well when doing things like merge > > or even update if you have local mods to a file that was renamed. Git > > actually handles this much better. SVN has tried to solve it with the > > tree conflict feature and incremental progress has been made to > > resolve those tree conflicts better but it still leaves a lot to be > > desired. > > What is left to be desired when updating or merging a renamed file > with local mods? As far as I know, in current versions of SVN, this > is working quite well.
That is good to hear. I have tried to follow all of the progress you have made over the last few releases but I mainly use Git in day to day work now and have not gone to trouble of setting up examples to try it all out. Does it all happen automatically now? I thought at one point we still created the tree conflict and then you had to run svn resolve or something like that to trigger the resolution? Does any of the resolution just happen automatically in the libraries or for something like Subclipse would a bunch of new stuff need to be exposed to JavaHL and then we would have to fill in an implementation? Mark
