Peter Kahn <citizenk...@gmail.com> writes: > *Problems we are seeing:* > > 1. changes not reported during trunk-to-branch merge show up in > subsequent branch-to-trunk > 2. conflicts on svn:mergefinfo properties during merge > 3. file missing, but local edit on new file added in branch and pushed to > trunk > 4. incoming + local delete (file deleted on trunk and branch shows as > conflict)
(2) There is a recent bug fix in 1.6.11 that might be relevant http://subversion.tigris.org/issues/show_bug.cgi?id=3573 but your description isn't detailed enough to say for sure. (4) This is deliberate Subversion policy as Subversion cannot distinguish between simple deletes and deletes that are part of a move. It's debatable whether this behaviour is correct, but it is deliberate. These conflicts are explicitly marked as delete-delete conflicts so you should be able to detect and resolve them, perhaps using a post-merge script. -- Philip
