I'm using svnmerge.py to manage our repository. In trunk, file X has been replaced a directory. When trying to merge this to a branch, I get the error:I'm using svnmerge.py to manage our repository.
I'm using svnmerge.py to manage our repository. In trunk, file X has been replaced a directory. When trying to merge this to a branch, I get the error:I'm using svnmerge.py to manage our repository.