On Mon, Jun 20, 2016 at 08:34:24AM +0200, Stefan Fuhrmann wrote: > Can you say what the main limitations are and whether you > plan to remove them? My guess would be: files only, one > move per file & conflict resolution cycle, no cyclic renames. > > -- Stefan^2.
I expect to get directories working for 1.10. My plan is to reuse some of the code we have in wc_db_update_move.c to merge a locally deleted directory (incoming move source) with a copied one (incoming move target). As for cycles, I'm not quite sure. The repository scanning code should handle them fine since it's just building a graph of delete+copy pairs across history. It's probably a question of doing the right thing in the WC. Update/merge/switch won't do anything to a node which is already in a tree conflict, so perhaps there's a possibility we're losing one of the renames? A regression test will tell us more. Would you like to write one? :) Some other limitations are already documented in the code. Look for ### comments in libsvn_client/conflicts.c.
