Michael Susser <hdmlist@googlemail.com>


Found
r874506

r874506 | pburba | 2008-11-26 11:02:47 -0600 (Wed, 26 Nov 2008)

Follow-up to r32975, fix bug with handling of paths which get explicit
mergeinfo added during a merge when the merge is a --dry-run.  See
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145757.

Found by: Michael Susser <hdmlist@googlemail.com>

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Update comment for paths_with_new_mergeinfo member.
  (merge_props_changed): Don't create/populate paths_with_new_mergeinfo
  if this is a dry-run.
  (process_children_with_new_mergeinfo): Do nothing if the merge is a
  dry-run.