So far I have not found a use case where moved file resolution in 1.8+ works as advertised on 1.7 servers. But more specifically, I have the following case:
The trunk has a directory, /foo/bar In my local branch, I have relocated bar to /baz/bar Meanwhile, in the trunk, file /foo/bar/example.c got updated. My local branch has been checked out from the 1.7 server so it no longer knows specifically about file moves. When I merge the latest changes from the trunk, it creates a tree conflict on /foo/bar. It has completely lost the notion that there is a file within /foo/bar that was edited. The conflict data only knows that /foo/bar doesn't exist anymore. My only option for resolution is to accept working – the search for where /foo/bar went also fails. And now the incoming edit to example.c is completely lost, and I wouldn't even know it existed until I did an svn diff on each revision that got merged in. So in summary, conflict resolution cannot find the new location for the 'bar' directory, and it completely forgot that there was an incoming file edit within that directory. Is this a missed case in the resolution heuristic? Or is there something I missed?
