On Sat, Apr 30, 2011 at 06:29:19PM +0200, Paolo Compieta wrote: > Hi, > this is a first post, hope it's well written and clear. I've found this > (candidate-)bug while at work, and it's a big problem for my company. > I'm posting this to ask if it's a known bug (i haven't found anything > similar in the issue tracker, hope i did the right searches) or if it's > some stupid practice we're using that impairs us from handling "svn > move on dirs" properly.
This is a remaining task tracked in this issue: http://subversion.tigris.org/issues/show_bug.cgi?id=3150#desc4 I would expect this feature to appear in the 1.8 or a later release. > > --- Details: > > OS: Ubuntu 10.04, Windows Vista > Subversion: 1.6.16 > > Bug: while merging, svn doesn't detect a tree conflict when: > source branch has "svn moved" (i.e. deleted) a folder > destination branch has modified a file inside the same folder > > Step to reproduce: > - trunk has folder A and file A/iota, branch is copied from this > - trunk moves (deletes) folder A, branch modifies A/iota > - branch merges from trunk > > Actual behavior: > svn doesn't rise any conflict or warning, discarding all > modifications in the branch > Expected behavior: > TREE CONFLICT: the directory being deleted in the branch > has changed from the merge's initial revision (see "Use > Case 5" and "Equality of directories" in > > http://svn.apache.org/repos/asf/subversion/trunk/notes/tree-conflicts/detection.txt) > > > Cheers, > Paolo Compieta
