Revert r30503, a.k.a. "Not pburba's finest hour".
Revert r30503, a.k.a. "Not pburba's finest hour".

* subversion/libsvn_client/merge.c
  (filter_self_referential_mergeinfo): The only reason this change was
  needed to filter empty mergeinfo was because of *another* bug earlier
  in this function where we claimed to do that, but didn't (fix for that
  coming shortly).  Worse, r30503 was itself flawed; if *all* incoming 
  mergeinfo was filtered then the  original unfiltered svn:mergeinfo prop 
  was put into the filtered array.  The moral of the story:  Pay attention
  and if you make a change to merge.c then run the %$#@! merge tests! 
  

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

wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion