Revision 1886044

Merge r1885983 from trunk:

 * r1885983
   Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
   Justification:
     Bugfix; 'svn info --xml' should give correct results; user complained.
   Votes:
     +1: hartmannathan, stsp, jcorvel