Teach symmetric merge to find the other base, so it will choose whichever base is younger.  Now it can merge back and forth between two branches. (The implementation doesn't yet cope with renames in the history of the branch, but that's a relatively SMOP.)
Teach symmetric merge to find the other base, so it will choose whichever
base is younger.  Now it can merge back and forth between two branches.
(The implementation doesn't yet cope with renames in the history of
the branch, but that's a relatively SMOP.)

* subversion/libsvn_client/merge.c
  (find_base_on_source): Fill in a rough implementation.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1303465 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion