Tobias Bading <>


r939376 | cmpilato | 2010-04-29 11:49:06 -0500 (Thu, 29 Apr 2010)

Fix issue #3623, a bug with foreign repository merges not carrying
property changes for merge-added files.

* subversion/libsvn_client/merge.c
  (merge_file_added): Rework logic for more explicit handling of new
    contents and properties that come through this callback.  When handling
    adds from foreign repositories, install the props and contents as
    *working* data (against empty base data), just like a regular
    schedule-add would be handled.

Reported by: Tobias Bading <tbading{_AT_}>