RE: 'svn mv' between disjoint wc's of disjoint subtrees
From: Bert Huijben <bert_at_qqmail.nl>
Date: Tue, 8 Jan 2013 12:30:56 +0100
> -----Original Message-----
And we only broke certain very specific scenarios in 1.7. All of them are documented including the entire reasoning in the api errata.
Just breaking things to get things released is something we can do in 2.0.
Moves can work the way they worked, including proper tracking... It is just a lot of work and might not fit a timeframe of a few weeks.
I'm not 100% sure for all the 'svn merge' scenarios, but for update and switch can just work by applying the after update/switch data to the op_depth of the move-target and then (auto-)resolving conflicts where we shadow that layer.
We know what was moved vs what was copies, because we marked the moves as such. (And if we didn't the bug is right there).
WC-NG doesn't store how a working copy was transformed to a state, but just the final state (see design), so moves can be combined once they are single revision. The merge code does this all the time.
This is an archived mail posted to the Subversion Dev mailing list.