Restore the previous merge detection heuristic, but with a twist.
authorUlrich Spörlein <uqs@spoerlein.net>
Fri, 12 Oct 2012 10:02:35 +0000 (12:02 +0200)
committerUlrich Spörlein <uqs@spoerlein.net>
Fri, 12 Oct 2012 10:02:35 +0000 (12:02 +0200)
commit065fb5701509bc1e78ded137737ed12041cb6a5e
tree3e48db35586e53847ff51b8ae1b1a6037700181d
parent8f8d4c770ac4884dc6c7909a342b27b28f23cbd9
Restore the previous merge detection heuristic, but with a twist.

For the FreeBSD project, we never wholly merge a branch to releng/,
release/ or stable/. For the doc project, merges to things like
translations/ are also flat out.

We still would want to track merges between user, project and master
branches, however, so that "IFC"s and such are recorded correctly.
src/svn.cpp