Alexey Neyman <sti...@att.net> writes: > Actually, looking at the commit I came up with a reproduction scenario:
Thanks for that! I've created an issue: http://subversion.tigris.org/issues/show_bug.cgi?id=4524 > Checked the issue using SVN trunk. It does not abort like 1.8.10, but > it does report tree conflicts for d1/f1 and d1. I would say such > conflicts should be resolved automatically, given that the working > copy contains exactly the same changes as in the incoming > edit. Figuring that out may not be trivial, though, as the copied > directory may be arbitrarily deep. The difficulty here is that Subversion does not know that the repository tree was created as a commit from this working copy. Resolving the tree-conflicts automatically probably needs more complete move-tracking. -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*
