Adjust the expected update output to make the regression test for issue 4015 PASS.  The reason it is different from the update of a plain 1.7 checkout is that the externals are not pegged.
Adjust the expected update output to make the regression test for
issue 4015 PASS.  The reason it is different from the update of a
plain 1.7 checkout is that the externals are not pegged.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_file_externals): Remove XFAIL, add comment about nested relocate.


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

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