Don't bother fetching the UUID from a svn_wc_entry_t, just use the API instead. (The UUID API just wraps a direct call into the libsvn_wc node info APIs.)
Don't bother fetching the UUID from a svn_wc_entry_t, just use the API instead.
(The UUID API just wraps a direct call into the libsvn_wc node info APIs.)

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo, svn_client_merge3,
   svn_client_merge_peg3): Don't conditionally get the uuid from an entry, just
    try and fetch it using an API.


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

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