← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/conflicts.h

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_wc/conflicts.h
419
419
svn_error_t *
420
420
svn_wc__conflict_invoke_resolver(svn_wc__db_t *db,
421
421
                                 const char *local_abspath,
 
422
                                 svn_node_kind_t kind,
422
423
                                 const svn_skel_t *conflict_skel,
423
424
                                 const apr_array_header_t *merge_options,
424
425
                                 svn_wc_conflict_resolver_func2_t resolver_func,
432
433
svn_error_t *
433
434
svn_wc__mark_resolved_text_conflict(svn_wc__db_t *db,
434
435
                                    const char *local_abspath,
 
436
                                    svn_cancel_func_t cancel_func,
 
437
                                    void *cancel_baton,
435
438
                                    apr_pool_t *scratch_pool);
436
439
 
437
440
/* Mark as resolved any prop conflicts on the node at DB/LOCAL_ABSPATH.  */