Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-3948

serf property conflicts with 1.6 server

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: ---
    • Fix Version/s: 1.7.0
    • Component/s: libsvn_wc
    • Labels:
      None

      Description

      Running the regression tests against a 1.6 server I see tree_conflicts.py 5 fail
      over ra_serf while it passes over ra_neon.
      
      Simple reproduction:
      
      svnadmin create repo
      svn mkdir -mm file://`pwd`/repo/A
      svnmucc -mm propset x x file://`pwd`/repo/A
      svnmucc -mm propset y y file://`pwd`/repo/A
      
      svn co http://localhost/repo@2 wc
      svn rm wc/A
      svn up wc --accept-postpone --config-option servers:global:http-library=serf
      
      Updating 'wc':
         C wc/A
      ../src/subversion/svn/update-cmd.c:163: (apr_err=2)
      ../src/subversion/libsvn_client/update.c:610: (apr_err=2)
      ../src/subversion/libsvn_client/update.c:551: (apr_err=2)
      ../src/subversion/libsvn_client/update.c:412: (apr_err=2)
      ../src/subversion/libsvn_ra_serf/update.c:2620: (apr_err=2)
      ../src/subversion/libsvn_ra_serf/update.c:2620: (apr_err=2)
      ../src/subversion/libsvn_ra_serf/update.c:667: (apr_err=2)
      ../src/subversion/libsvn_ra_serf/update.c:631: (apr_err=2)
      ../src/subversion/libsvn_wc/update_editor.c:2582: (apr_err=2)
      svn: E000002: Couldn't do property merge
      ../src/subversion/libsvn_wc/props.c:1710: (apr_err=2)
      ../src/subversion/libsvn_subr/io.c:488: (apr_err=2)
      svn: E000002: Can't open '/home/pm/sw/subversion/obj/wc/A/dir_conflicts.prej':
      No such file or directory
      
      With neon, or a 1.7 server, the update gives:
      
      Updating 'wc':
         C wc/A
      At revision 3.
      Summary of conflicts:
        Tree conflicts: 1
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              philipm Philip Martin
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: