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

Re: Problem with non-conflicting merges of moves

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 25 Aug 2017 15:07:48 +0000

Stefan Sperling wrote on Thu, 24 Aug 2017 13:44 +0200:
> 5) Make the server send copyfrom args again (as it did in 1.5 times for
> files during 'svn update'), but only during merges/(diffs?) and for
> files and directories, with a heuristic that sends the correct copyfrom
> source to the client. Allows 'svn merge' to record "correct" copyfrom
> in the WC without overhead and conflicts, but implies additional
> server-side processing. Also requires RA protocol changes.
> My impression is that some of the code which was reverted in r1597989
> could be used for making this work.
> This is probably a lot of effort but could be worth it.

Doesn't directly answer your question, but: If we do end up making the
server send heuristic guesses to the client, could we please have them
*explicitly* marked as such, so API consumers don't mistaken the
heuristic guess for an accurate answer.

Cheers,

Daniel
Received on 2017-08-25 17:07:58 CEST

This is an archived mail posted to the Subversion Dev mailing list.