Add some #ifdef-d-out logic for purging svn:mergeinfo and migrating
commit64a4385f5278b85a723dbdbfe7617fea48425b18
authorcmpilato <cmpilato@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Fri, 29 Feb 2008 18:46:25 +0000 (29 18:46 +0000)
committercmpilato <cmpilato@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Fri, 29 Feb 2008 18:46:25 +0000 (29 18:46 +0000)
tree7fb22a3d6d9acc2b62e025b89a093b5692b383c7
parente52ebd8f17b937d4a606f961843ec4ec838632d2
Add some #ifdef-d-out logic for purging svn:mergeinfo and migrating
svnmerge tracking data using svnsync.

* subversion/svnsync/main.c
  If SVN_SYNC__REPAIR_MERGEINFO is #defined...
  (change_file_prop): ...drop svn:mergeinfo properties and bogus
    (because they only apply to directories) svnmerge-integrated
    and svnmerge-blocked properties.
  (change_dir_prop): ...drop svn:mergeinfo properties, rename
    svnmerge-integrated properties to svn:mergeinfo, and warn about
    (but allow) svnmerge-blocked properties.

git-svn-id: http://svn.collab.net/repos/svn/trunk@29641 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
subversion/svnsync/main.c