Philip Martin <philip.mar...@wandisco.com> writes:
> I still think we may get something working by the end of the year. The
> simple cases will work and should be useful. The more complex cases
> should also work to some extent, but it's possible that some subsequent
> tree-conflicts that should be detected while resolving the first
> tree-conflict may get missed.
This now works to a certain extent. When an update attempts to apply
changes to a moved tree it causes a tree-conflict on the move source
just like 1.7. When resolving the tree-conflict the user can choose to
apply the changes to the move destination and this now updates the NODES
rows for the move destination and merges the changes in the working
files. This may in turn generate tree-conflicts in the move destination
for nested moves, deletes, obstructions. For nested moves the
tree-conflict can also be resolved by applying the changes to the move
destination.
Things that need more work:
- tests.
- handling deleting files/dirs from the working files, at present they
are left unversioned.
- handle an update that makes no text/property/tree changes in the
move source, probably by creating a tree-conflict during the
post-drive revision bump.
- switch can cause the tree-conflicts on the move source, at present
the new code hard-codes 'update'.
- more tests (again).
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
