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

merge is sensitive to schema (e.g., http:// vs https://)

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: unscheduled
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      I had a working copy from
      https://svn.collab.net/repos/svn/branches/issue-2843-dev/.  I ran
      
         svn merge http://svn.collab.net/repos/svn/trunk
      
      (note the "http" instead of "https").  That attempt to merge got the results
      shown at http://paste.lisp.org/display/68179, namely:
      
         $ svn merge http://svn.collab.net/repos/svn/trunk
         Conflict discovered in 'Makefile.in'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         --- Merging (from foreign repository) r2 through r33554 into '.':
         CG   Makefile.in
         Conflict discovered in 'build.conf'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         CG   build.conf
         Conflict discovered in 'www/links.html'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         C    www/links.html
          G   www/testing-goals.html
         A    www/commercial-support.html
         A    www/project_tools.html
         A    www/user-classifications.html
         A    www/bitmover-svn.html
         Skipped 'www/merge-tracking'
         A    www/merge-tracking/summit.html
         Conflict discovered in 'www/merge-tracking/func-spec.html'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         C    www/merge-tracking/func-spec.html
         A    www/merge-tracking/requirements.html
         A    www/merge-tracking/index.html
         A    www/merge-tracking/design.html
         A    www/merge-tracking/summit-survey.html
         Conflict discovered in 'www/getting.html'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         C    www/getting.html
         A    www/subversion-diagram.graffle
         A    www/project_packages.html
         A    www/toctool.py
         A    www/project_development.html
          G   www/project_status.html
         A    www/mailing-list-guidelines.html
         subversion/libsvn_wc/tree_conflicts.c:524: (apr_err=155016)
         svn: Attempt to add tree conflict that already exists
         subversion/libsvn_ra_neon/util.c:1243: (apr_err=175002)
         svn: Error reading spooled REPORT request response
      
      When I tried again with "https", thus matching my working copy, it got much
      further, though it then died on a probably-unrelated bug, as shown in
      http://paste.lisp.org/display/68181:
      
         $ svn merge https://svn.collab.net/repos/svn/trunk
         --- Merging r32488 through r33554 into '.':
         U    Makefile.in
         UU   build.conf
         U    www/links.html
         U    www/merge-tracking/func-spec.html
         U    www/getting.html
         --- Merging r32488 through r33554 into 'www/issue-tracker.html':
          G   www/issue-tracker.html
         --- Merging r32488 through r33554 into '.':
         U    www/roadmap.html
         U    www/faq.ja.html
         U    www/bugs.html
         A    www/svn_1.6_releasenotes.html
         U    www/hacking.html
         A    www/repro-template.sh
         U    www/release-history.html
         --- Merging r32488 through r33554 into 'www/development.html':
          G   www/development.html
         --- Merging r32488 through r33554 into '.':
          U   www/images/fedora.png
          U   www/images/mac.png
          U   www/images/subversion-diagram.png
          U   www/images/subversion_logo-200x173.png
          U   www/images/hp.png
          U   www/images/redhat.png
          U   www/images/subversion_logo_hor-468x64.png
          U   www/images/freebsd.png
          U   www/images/subversion_logo-384x332.png
          U   www/images/merge-tracking/revisions-to-merge.png
          U   www/images/merge-tracking/record-merge-info.png
          U   www/images/merge-tracking/perform-a-merge.png
          U   www/images/merge-tracking/calculate-ranges-already-merged.png
          U   www/images/merge-tracking/handle-merge-conflicts.png
          U   www/images/merge-tracking/retrieve-merge-info.png
          U   www/images/solaris.png
          U   www/images/suse.png
          U   www/images/netbsd.png
          U   www/images/aix.png
          U   www/images/debian.png
          U   www/images/mandrake.png
          U   www/images/jolt-2005.jpg
          U   www/images/openbsd.png
         UU   www/images/svn-dav-securityspace-survey.png
          U   www/images/windows.png
         U    www/faq.html
         --- Merging r32488 through r33554 into 'www/tasks.html':
          G   www/tasks.html
         --- Merging r32488 through r33554 into '.':
         U    www/svn-dav-securityspace-survey.html
         U    www/svn_1.5_releasenotes.html
         U    www/index.html
         U    win-tests.py
         U    COMMITTERS
         A    notes/http-protocol-v2.txt
         U    notes/svnsync.txt
         U    notes/webdav-proxy
         U    notes/webdav-protocol
         U    notes/fs-improvements.txt
         --- Merging r32488 through r33554 into 'notes/tree-conflicts/requirements.txt':
          G   notes/tree-conflicts/requirements.txt
         --- Merging r32488 through r33554 into
      'notes/tree-conflicts/design-overview.txt':
          G   notes/tree-conflicts/design-overview.txt
         --- Merging r32488 through r33554 into '.':
         U    notes/tree-conflicts/detection.txt
         U    notes/wc-ng-design
         U    notes/compatibility.txt
         U    notes/l10n-problems
         --- Merging r32488 through r33554 into 'subversion':
         U    subversion/libsvn_ra/compat.c
         U    subversion/libsvn_ra/ra_loader.c
         U    subversion/libsvn_diff/diff_memory.c
         U    subversion/libsvn_diff/diff_file.c
         U    subversion/libsvn_fs/access.c
         U    subversion/libsvn_fs/fs-loader.h
         U    subversion/libsvn_fs/fs-loader.c
         U    subversion/libsvn_subr/subst.c
         A    subversion/libsvn_subr/sqlite.c
         U    subversion/libsvn_subr/config_file.c
         U    subversion/libsvn_subr/config.c
         U    subversion/libsvn_subr/cache-inprocess.c
         U    subversion/libsvn_subr/svn_base64.c
         U    subversion/libsvn_subr/cmdline.c
         U    subversion/libsvn_subr/ssl_client_cert_pw_providers.c
         U    subversion/libsvn_subr/hash.c
         U    subversion/libsvn_subr/md5.c
         U    subversion/libsvn_subr/error.c
         A    subversion/libsvn_subr/md5.h
         U    subversion/libsvn_subr/utf.c
         U    subversion/libsvn_subr/win32_xlate.c
         A    subversion/libsvn_subr/win32_crypto.c
         U    subversion/libsvn_subr/opt.c
         A    subversion/libsvn_subr/checksum.c
         U    subversion/libsvn_subr/cache-memcache.c
         A    subversion/libsvn_subr/dirent_uri.c
         U    subversion/libsvn_subr/ssl_client_cert_providers.c
         U    subversion/libsvn_subr/pool.c
         U    subversion/libsvn_subr/username_providers.c
         U    subversion/libsvn_subr/atomic.c
         U    subversion/libsvn_subr/config_auth.c
         U    subversion/libsvn_subr/simple_providers.c
         U    subversion/libsvn_subr/target.c
         U    subversion/libsvn_subr/config_impl.h
         A    subversion/libsvn_subr/sha1.c
         A    subversion/libsvn_subr/sha1.h
         U    subversion/libsvn_subr/io.c
         A    subversion/libsvn_subr/macos_keychain.c
         U    subversion/libsvn_subr/prompt.c
         U    subversion/libsvn_subr/validate.c
         U    subversion/libsvn_subr/stream.c
         U    subversion/libsvn_subr/svn_string.c
         U    subversion/libsvn_subr/cache.c
         U    subversion/libsvn_subr/cache.h
         U    subversion/libsvn_subr/win32_crashrpt.c
         U    subversion/libsvn_subr/sorts.c
         U    subversion/libsvn_subr/mergeinfo.c
         U    subversion/libsvn_subr/config_win.c
         U    subversion/libsvn_subr/genctype.py
         U    subversion/libsvn_subr/utf_impl.h
         U    subversion/libsvn_subr/ssl_server_trust_providers.c
         U    subversion/libsvn_subr/properties.c
         U    subversion/libsvn_subr/path.c
          U   subversion/libsvn_subr
         U    subversion/libsvn_ra_local/ra_plugin.c
         U    subversion/libsvn_ra_local/split_url.c
         A    subversion/libsvn_auth_gnome_keyring/version.c
         U    subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
         U    subversion/bindings/javahl/native/Pool.h
         U    subversion/bindings/javahl/native/SVNClient.cpp
          U   subversion/bindings/javahl/native
         U    subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
         A    subversion/bindings/ctypes-python
         A    subversion/bindings/ctypes-python/test
         A    subversion/bindings/ctypes-python/test/wc.py
         A    subversion/bindings/ctypes-python/test/svntypes.py
         A    subversion/bindings/ctypes-python/test/run_all.py
         A    subversion/bindings/ctypes-python/test/setup_path.py
         A    subversion/bindings/ctypes-python/test/test.dumpfile
         A    subversion/bindings/ctypes-python/test/localrepos.py
         A    subversion/bindings/ctypes-python/test/remoterepos.py
         A    subversion/bindings/ctypes-python/TODO
         A    subversion/bindings/ctypes-python/setup.py
         A    subversion/bindings/ctypes-python/csvn
         A    subversion/bindings/ctypes-python/csvn/repos.py
         A    subversion/bindings/ctypes-python/csvn/ext
         A    subversion/bindings/ctypes-python/csvn/ext/__init__.py
         A    subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
         A    subversion/bindings/ctypes-python/csvn/ext/listmixin.py
         A    subversion/bindings/ctypes-python/csvn/txn.py
         A    subversion/bindings/ctypes-python/csvn/wc.py
         A    subversion/bindings/ctypes-python/csvn/__init__.py
         A    subversion/bindings/ctypes-python/csvn/auth.py
         A    subversion/bindings/ctypes-python/csvn/core
         A    subversion/bindings/ctypes-python/csvn/core/functions.py.in
         A    subversion/bindings/ctypes-python/csvn/core/__init__.py
         A    subversion/bindings/ctypes-python/csvn/types.py
         A    subversion/bindings/ctypes-python/README
         A    subversion/bindings/ctypes-python/examples
         A    subversion/bindings/ctypes-python/examples/example.py
         A    subversion/bindings/ctypes-python/examples/trunkify.py
         A    subversion/bindings/ctypes-python/examples/log.py
         A    subversion/bindings/ctypes-python/examples/mucc.py
         U    subversion/bindings/swig/python/tests/client.py
         U    subversion/bindings/swig/python/tests/repository.py
         U    subversion/bindings/swig/python/tests/ra.py
         U    subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
         U    subversion/bindings/swig/python/tests/trac/versioncontrol/main.py
         U    subversion/bindings/swig/python/svn/repos.py
         U    subversion/bindings/swig/ruby/test/test_client.rb
         U    subversion/bindings/swig/ruby/test/windows_util.rb
         U    subversion/bindings/swig/svn_delta.i
         U    subversion/mod_dav_svn/deadprops.c
         U    subversion/mod_dav_svn/liveprops.c
         U    subversion/mod_dav_svn/version.c
         U    subversion/mod_dav_svn/lock.c
         U    subversion/mod_dav_svn/repos.c
         U    subversion/mod_dav_svn/activity.c
         U    subversion/mod_dav_svn/reports/log.c
         U    subversion/mod_dav_svn/reports/update.c
         U    subversion/mod_dav_svn/reports/get-locks.c
         U    subversion/mod_dav_svn/reports/mergeinfo.c
         U    subversion/mod_dav_svn/reports/file-revs.c
         U    subversion/mod_dav_svn/reports/replay.c
         U    subversion/tests/libsvn_fs_base/changes-test.c
         U    subversion/tests/libsvn_fs_base/fs-base-test.c
         U    subversion/tests/libsvn_diff/diff-diff3-test.c
         U    subversion/tests/libsvn_fs/fs-test.c
         U    subversion/tests/libsvn_fs/locks-test.c
         A    subversion/tests/libsvn_wc
         A    subversion/tests/libsvn_wc/tree-conflict-data-test.c
         U    subversion/tests/libsvn_subr/target-test.c
         U    subversion/tests/libsvn_subr/path-test.c
         U    subversion/tests/libsvn_subr/translate-test.c
         A    subversion/tests/libsvn_subr/checksum-test.c
         U    subversion/tests/libsvn_subr/opt-test.c
         U    subversion/tests/libsvn_subr/cache-test.c
         A    subversion/tests/libsvn_subr/dirent_uri-test.c
         U    subversion/tests/libsvn_subr/string-test.c
         U    subversion/tests/libsvn_subr/hashdump-test.c
         D    subversion/tests/libsvn_subr/target-test.py
          U   subversion/tests/libsvn_subr
         U    subversion/tests/svn_test.h
         U    subversion/tests/libsvn_repos/repos-test.c
         U    subversion/tests/libsvn_delta/svndiff-test.c
         U    subversion/tests/libsvn_delta/vdelta-test.c
         U    subversion/tests/libsvn_delta/random-test.c
         U    subversion/tests/cmdline/revert_tests.py
         U    subversion/tests/cmdline/svnadmin_tests.py
         A    subversion/tests/cmdline/tree_conflict_tests.py
         U    subversion/tests/cmdline/log_tests.py
         U    subversion/tests/cmdline/changelist_tests.py
         U    subversion/tests/cmdline/switch_tests.py
         U    subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
         U    subversion/tests/cmdline/externals_tests.py
         A    subversion/tests/cmdline/tree_conflict_tests.txt
         U    subversion/tests/cmdline/diff_tests.py
         U    subversion/tests/cmdline/copy_tests.py
         U    subversion/tests/cmdline/merge_authz_tests.py
         U    subversion/tests/cmdline/stat_tests.py
         U    subversion/tests/cmdline/prop_tests.py
         U    subversion/tests/cmdline/special_tests.py
         U    subversion/tests/cmdline/blame_tests.py
         U    subversion/tests/cmdline/basic_tests.py
         U    subversion/tests/cmdline/update_tests.py
         U    subversion/tests/cmdline/commit_tests.py
         A    subversion/tests/cmdline/info_tests.py
         U    subversion/tests/cmdline/svntest/wc.py
         U    subversion/tests/cmdline/svntest/tree.py
         U    subversion/tests/cmdline/svntest/actions.py
         U    subversion/tests/cmdline/svntest/entry.py
         U    subversion/tests/cmdline/svntest/main.py
         U    subversion/tests/cmdline/merge_tests.py
         U    subversion/tests/cmdline/depth_tests.py
         U    subversion/tests/cmdline/checkout_tests.py
         U    subversion/tests/svn_test_fs.c
         U    subversion/svndumpfilter/main.c
         U    subversion/libsvn_ra_svn/client.c
         U    subversion/libsvn_ra_svn/cyrus_auth.c
         U    subversion/libsvn_ra_svn/editorp.c
         U    subversion/svn/props.c
         U    subversion/svn/cl.h
         U    subversion/svn/diff-cmd.c
         U    subversion/svn/list-cmd.c
         U    subversion/svn/util.c
         U    subversion/svn/changelist-cmd.c
         U    subversion/svn/log-cmd.c
         U    subversion/svn/update-cmd.c
         U    subversion/svn/status.c
         U    subversion/svn/resolved-cmd.c
         U    subversion/svn/switch-cmd.c
         U    subversion/svn/notify.c
         U    subversion/svn/proplist-cmd.c
         U    subversion/svn/conflict-callbacks.c
         U    subversion/svn/schema/status.rnc
         U    subversion/svn/schema/info.rnc
         U    subversion/svn/resolve-cmd.c
         A    subversion/svn/tree-conflicts.c
         U    subversion/svn/export-cmd.c
         U    subversion/svn/main.c
         U    subversion/svn/status-cmd.c
         A    subversion/svn/tree-conflicts.h
         U    subversion/svn/lock-cmd.c
         U    subversion/svn/info-cmd.c
         U    subversion/svn/unlock-cmd.c
         U    subversion/svnversion/main.c
         U    subversion/po/fr.po
         U    subversion/po/de.po
         U    subversion/po/ko.po
         U    subversion/po/pl.po
         U    subversion/po/nb.po
         U    subversion/po/zh_CN.po
         U    subversion/libsvn_fs_base/tree.c
         U    subversion/libsvn_fs_base/reps-strings.c
         U    subversion/libsvn_fs_base/dag.h
         U    subversion/libsvn_fs_base/tree.h
         U    subversion/libsvn_fs_base/reps-strings.h
         U    subversion/libsvn_fs_base/uuid.c
         U    subversion/libsvn_fs_base/bdb/reps-table.c
         U    subversion/libsvn_fs_base/bdb/copies-table.c
         U    subversion/libsvn_fs_base/bdb/uuids-table.c
         U    subversion/libsvn_fs_base/bdb/strings-table.c
         U    subversion/libsvn_fs_base/bdb/lock-tokens-table.c
         U    subversion/libsvn_fs_base/bdb/node-origins-table.c
         U    subversion/libsvn_fs_base/bdb/env.c
         U    subversion/libsvn_fs_base/bdb/nodes-table.c
         U    subversion/libsvn_fs_base/bdb/txn-table.c
         U    subversion/libsvn_fs_base/bdb/locks-table.c
         A    subversion/libsvn_fs_base/bdb/metadata-table.c
         A    subversion/libsvn_fs_base/bdb/metadata-table.h
         U    subversion/libsvn_fs_base/bdb/changes-table.c
         U    subversion/libsvn_fs_base/notes/structure
         U    subversion/libsvn_fs_base/fs.c
         U    subversion/libsvn_fs_base/revs-txns.c
         U    subversion/libsvn_fs_base/fs.h
         U    subversion/libsvn_fs_base/lock.c
         U    subversion/libsvn_fs_base/err.c
         U    subversion/libsvn_fs_base/dag.c
         U    subversion/libsvn_fs_base/util/fs_skels.c
         U    subversion/libsvn_fs_base/err.h
         U    subversion/svnadmin/main.c
         U    subversion/include/svn_cache.h
         A    subversion/include/svn_dirent_uri.h
         U    subversion/include/svn_error_codes.h
         U    subversion/include/svn_fs.h
         U    subversion/include/svn_diff.h
         U    subversion/include/svn_sorts.h
         U    subversion/include/svn_mergeinfo.h
         U    subversion/include/svn_compat.h
         U    subversion/include/svn_base64.h
         U    subversion/include/svn_ctype.h
         U    subversion/include/svn_dso.h
         U    subversion/include/svn_version.h
         U    subversion/include/svn_ra_svn.h
         U    subversion/include/svn_repos.h
         U    subversion/include/svn_delta.h
         U    subversion/include/svn_path.h
         U    subversion/include/svn_xml.h
         U    subversion/include/svn_subst.h
         U    subversion/include/svn_props.h
         U    subversion/include/svn_types.h
         U    subversion/include/svn_config.h
         U    subversion/include/svn_string.h
         U    subversion/include/svn_io.h
         U    subversion/include/svn_wc.h
         U    subversion/include/svn_cmdline.h
         U    subversion/include/svn_client.h
         U    subversion/include/svn_quoprint.h
         U    subversion/include/svn_hash.h
         U    subversion/include/svn_md5.h
         U    subversion/include/svn_error.h
         U    subversion/include/svn_pools.h
         U    subversion/include/svn_nls.h
         U    subversion/include/private/svn_wc_private.h
         U    subversion/include/private/svn_fs_util.h
         U    subversion/include/private/svn_dep_compat.h
         U    subversion/include/private/ra_svn_sasl.h
         U    subversion/include/private/svn_utf_private.h
         --- Merging r32488 through r33554 into
      'subversion/include/private/svn_auth_private.h':
         UG   subversion/include/private/svn_auth_private.h
         --- Merging r32488 through r33554 into 'subversion':
         U    subversion/include/private/svn_opt_private.h
         A    subversion/include/private/svn_sqlite.h
         U    subversion/include/private/svn_fs_private.h
         D    subversion/include/svn_auth_dso.h
         U    subversion/include/svn_time.h
         U    subversion/include/svn_utf.h
         U    subversion/include/svn_auth.h
         U    subversion/include/svn_ra.h
         U    subversion/include/svn_opt.h
         A    subversion/include/svn_checksum.h
          U   subversion/include
         U    subversion/libsvn_wc/relocate.c
         U    subversion/libsvn_wc/revision_status.c
         U    subversion/libsvn_wc/props.c
         U    subversion/libsvn_wc/util.c
         U    subversion/libsvn_wc/wc.h
         U    subversion/libsvn_wc/ambient_depth_filter_editor.c
         U    subversion/libsvn_wc/adm_ops.c
         U    subversion/libsvn_wc/status.c
         U    subversion/libsvn_wc/adm_files.c
         A    subversion/libsvn_wc/wc-metadata.sql3
         Conflict discovered in 'subversion/libsvn_wc/update_editor.c'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         C    subversion/libsvn_wc/update_editor.c
         U    subversion/libsvn_wc/adm_files.h
         U    subversion/libsvn_wc/lock.c
         U    subversion/libsvn_wc/questions.c
         U    subversion/libsvn_wc/lock.h
         U    subversion/libsvn_wc/translate.c
         U    subversion/libsvn_wc/merge.c
         A    subversion/libsvn_wc/tree_conflicts.c
         U    subversion/libsvn_wc/diff.c
         A    subversion/libsvn_wc/tree_conflicts.h
         U    subversion/libsvn_wc/entries.c
         U    subversion/libsvn_wc/copy.c
         Conflict discovered in 'subversion/libsvn_wc/README'.
         Select: (p) postpone, (df) diff-full, (e) edit,
                 (mc) mine-conflict, (tc) theirs-conflict,
                 (s) show all options: p
         C    subversion/libsvn_wc/README
         U    subversion/libsvn_wc/entries.h
         A    subversion/libsvn_wc/wc_db.c
         U    subversion/libsvn_wc/adm_crawler.c
         U    subversion/libsvn_wc/log.c
         A    subversion/libsvn_wc/wc_db.h
         U    subversion/libsvn_wc/log.h
         U    subversion/libsvn_client/relocate.c
         U    subversion/libsvn_client/switch.c
         U    subversion/libsvn_client/delete.c
         U    subversion/libsvn_client/externals.c
         U    subversion/libsvn_client/cmdline.c
         U    subversion/libsvn_client/util.c
         U    subversion/libsvn_client/repos_diff.c
         U    subversion/libsvn_client/compat_providers.c
         U    subversion/libsvn_client/revisions.c
         U    subversion/libsvn_client/export.c
         U    subversion/libsvn_client/client.h
         U    subversion/libsvn_client/status.c
         U    subversion/libsvn_client/info.c
         U    subversion/libsvn_client/merge.c
         U    subversion/libsvn_client/prop_commands.c
         U    subversion/libsvn_client/ra.c
         U    subversion/libsvn_client/checkout.c
         U    subversion/libsvn_client/cat.c
         U    subversion/libsvn_client/locking_commands.c
         U    subversion/libsvn_client/revert.c
         U    subversion/libsvn_client/diff.c
         U    subversion/libsvn_client/copy.c
         U    subversion/libsvn_client/mergeinfo.c
         U    subversion/libsvn_client/repos_diff_summarize.c
         U    subversion/libsvn_client/blame.c
         U    subversion/libsvn_client/mergeinfo.h
         U    subversion/libsvn_client/changelist.c
         U    subversion/libsvn_client/update.c
         U    subversion/libsvn_client/resolved.c
         U    subversion/libsvn_client/commit_util.c
         U    subversion/libsvn_client/add.c
         U    subversion/libsvn_client/commit.c
         U    subversion/svnlook/main.c
         U    subversion/libsvn_ra_serf/serf.c
         U    subversion/libsvn_ra_serf/README
         U    subversion/libsvn_ra_serf/util.c
         U    subversion/libsvn_ra_serf/getdate.c
         U    subversion/libsvn_ra_serf/win32_auth_sspi.c
         U    subversion/libsvn_ra_serf/log.c
         U    subversion/libsvn_ra_serf/update.c
         U    subversion/libsvn_ra_serf/property.c
         U    subversion/libsvn_ra_serf/ra_serf.h
         U    subversion/libsvn_ra_serf/commit.c
         U    subversion/libsvn_ra_serf/replay.c
         D    subversion/libsvn_ra_serf/propfind_buckets.c
         U    subversion/libsvn_ra_neon/merge.c
         U    subversion/libsvn_ra_neon/props.c
         U    subversion/libsvn_ra_neon/mergeinfo.c
         U    subversion/libsvn_ra_neon/get_location_segments.c
         U    subversion/libsvn_ra_neon/util.c
         U    subversion/libsvn_ra_neon/log.c
         U    subversion/libsvn_ra_neon/session.c
         U    subversion/libsvn_ra_neon/commit.c
         U    subversion/libsvn_ra_neon/fetch.c
         U    subversion/libsvn_ra_neon/get_locations.c
         U    subversion/libsvn_ra_neon/get_dated_rev.c
         --- Merging r32488 through r33554 into
      'subversion/libsvn_auth_kwallet/kwallet.cpp':
         UG   subversion/libsvn_auth_kwallet/kwallet.cpp
         --- Merging r32488 through r33554 into 'subversion':
         A    subversion/libsvn_auth_kwallet/version.c
         U    subversion/svnsync/main.c
         U    subversion/libsvn_repos/fs-wrap.c
         U    subversion/libsvn_repos/load.c
         U    subversion/libsvn_repos/log.c
         U    subversion/libsvn_repos/reporter.c
         U    subversion/libsvn_repos/hooks.c
         U    subversion/libsvn_repos/node_tree.c
         U    subversion/libsvn_repos/dump.c
         U    subversion/libsvn_repos/commit.c
         U    subversion/libsvn_repos/repos.c
         U    subversion/libsvn_repos/delta.c
         U    subversion/libsvn_repos/rev_hunt.c
         U    subversion/libsvn_repos/authz.c
         U    subversion/libsvn_repos/replay.c
         U    subversion/libsvn_repos/repos.h
         U    subversion/libsvn_delta/svndiff.c
         U    subversion/libsvn_delta/cancel.c
         U    subversion/libsvn_delta/path_driver.c
         U    subversion/libsvn_delta/debug_editor.c
         U    subversion/libsvn_delta/text_delta.c
         U    subversion/svnserve/main.c
         U    subversion/svnserve/serve.c
         U    subversion/svnserve/cyrus_auth.c
         U    subversion/libsvn_fs_fs/tree.c
         U    subversion/libsvn_fs_fs/dag.h
         U    subversion/libsvn_fs_fs/fs_fs.c
         U    subversion/libsvn_fs_fs/fs_fs.h
         U    subversion/libsvn_fs_fs/fs.h
         U    subversion/libsvn_fs_fs/lock.c
         U    subversion/libsvn_fs_fs/dag.c
         U    subversion/libsvn_fs_fs/caching.c
         --- Merging r32488 through r33554 into '.':
         U    build/win32/make_dist.py
         U    build/win32/svn.rc
         A    build/ac-macros/ctypesgen.m4
         A    build/ac-macros/sqlite.m4
         U    build/ac-macros/aprutil.m4
         U    build/ac-macros/neon.m4
         U    build/get-py-info.py
         U    build/generator/gen_vcnet_vcproj.py
         U    build/generator/svn_locale.vcproj.ezt
         U    build/generator/ezt.py
         U    build/generator/gen_base.py
         U    build/generator/vc2005_sln.ezt
         U    build/generator/gen_make.py
         U    build/generator/gen_msvc_dsp.py
         U    build/generator/svn_config.vcproj.ezt
         U    build/generator/serf.vcproj.ezt
         U    build/generator/neon.vcproj.ezt
         U    build/generator/extractor.py
         U    build/generator/vcnet_vcproj.ezt
         U    build/generator/zlib.vcproj.ezt
         U    build/generator/swig/header_wrappers.py
         U    build/generator/swig/__init__.py
         U    build/generator/swig/external_runtime.py
         U    build/generator/swig/checkout_swig_header.py
         U    build/generator/gen_win.py
         U    build/generator/util/executable.py
         U    build/find_python.sh
         U    build/strip-po-charset.py
         U    build/getversion.py
         U    build/run_tests.py
         U    tools/client-side/bash_completion
         U    tools/client-side/change-svn-wc-format.py
         U    tools/dist/construct-rolling-environment.sh
         A    tools/buildbot/slaves/win32-xp-VS2005
         A    tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
         A    tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
         A    tools/buildbot/slaves/win32-xp-VS2005/config.bat
         A    tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
         A    tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
         A    tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
         subversion/libsvn_ra_neon/util.c:545: (apr_err=160013)
         svn:
      '/repos/svn/!svn/bc/33554/branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005'
      path not found
         subversion/libsvn_ra_neon/util.c:1243: (apr_err=175002)
         svn: Error reading spooled REPORT request response
      
      Again, that error at the end is probably unrelated to the bug this issue is
      about, and is instead about r33536.  I mention that here in case you got
      impatient and scrolled down to the bottom of this description and assumed that
      the error you saw at the end was what this bug is about.  It's not; for this
      bug's purposes, please regard that second merge as successful.
      
      The question is, why do schemas need to match?  Should the repository UUID
      govern here?
      

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                kfogel Karl Fogel
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated: