Martin Hauner <>

Patch Suggested
r879924, r879536, r874561, r872018, r860248, r860151, r856550, r851666, r850685, r850166, r847318 r865591, r859553, r855803

r847318 | mbk | 2003-09-29 18:58:30 +0000 (Mon, 29 Sep 2003)

* subversion/libsvn_diff/diff3.c
 (svn_diff__resolve_conflict): added missing initialization of
 resolved_diff member in newly created svn_diff_t's.

Patch by: Martin Hauner <>

r850166 | breser | 2004-06-28 14:36:14 +0000 (Mon, 28 Jun 2004)

Website links update.

Patch by: Martin Hauner <>

* www/project_links.html
  Added link to Subcommander GUI client.

r850685 | sussman | 2004-08-13 00:02:15 +0000 (Fri, 13 Aug 2004)

Documentation clarification

Patch by: Martin Hauner <>

* subversion/include/svn_client.h
  (svn_client_get_commit_log_t): modified documentation to say that
  commit_items is a read-only array.

r851666 | brane | 2004-10-23 14:25:56 +0000 (Sat, 23 Oct 2004)

Improve the performance of "svn st".
Patch by: Martin Hauner <>

* subversion/libsvn_wc/props.c (svn_wc_prop_list): removed an
  unecessary svn_io_check_path call. svn_wc__load_prop_file already
  does the check.

r855803 | lundblad | 2005-08-15 19:55:35 +0000 (Mon, 15 Aug 2005)

Fix ra_svn protocol command synopsis.

Suggested by: Martin Hauner <>

* subversion/libsvn_ra_svn/protocol: Add ignore-ancestry parameter
  to diff command, which has been there in the implementation since

r856550 | lundblad | 2005-10-05 07:35:27 +0000 (Wed, 05 Oct 2005)

Add new client API calls svn_client_diff_summarize and 
A diff summary lists the changed items without calculating text deltas.

To achieve this the svn_ra__vtable_t do_diff function got a new boolean
parameter text_deltas that is finally passed to svn_repos_begin_report
to run the diff without creating text deltas.

Patch by: Martin Hauner <>

* subversion/include/svn_ra.h
  (svn_ra_do_diff2): New method, similar to svn_ra_do_diff but with a
  new text_deltas boolean parameter.
  (svn_ra_do_diff): Deprecated.

* subversion/libsvn_ra/ra_loader.h
  (svn_ra__vtable_t): Added text_deltas parameter to do_diff function.

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_do_diff2): New function.
  (svn_ra_do_diff): Call svn_ra_do_diff2 with TRUE for the text_deltas
* subversion/libsvn_ra/wrapper_template.h
  (compat_do_diff): Pass TRUE for textdeltas parameter of do_diff.

* subversion/include/svn_client.h
  (svn_client_diff_summarize, svn_client_diff_summarize_peg): New
  (svn_client_diff_summarize_func_t): New callback type.
  (svn_client_diff_summarize_t): New struct.
  (svn_client_diff_summarize_kind_t): New enum type.

* subversion/libsvn_client/client.h
  (svn_client__get_diff_summary_editor): New function.
* subversion/libsvn_client/repos_diff_summarize.c
  New file, the implementation of the diff summary svn_delta_editor_t.

* subversion/libsvn_client/diff.c
  (diff_parameters, diff_paths, diff_repos_repos): New helper structs
  (check_paths, diff_prepare_repos_repos): New helper functions used to
  remove most of the code duplication between diff and diff summarize.
  (diff_summarize_repos_repos, do_diff_summarize, do_diff_summarize_peg,
  svn_client_diff_summarize, svn_client_diff_summarize_peg):
  New functions.
  (diff_repos_repos): Replaced diff parameters with diff_parameters
  structure. Removed code duplication with diff_summarize_repos_repos
  by using the new helper functions.
  (do_diff, do_diff_peg): Replaced diff parameters with diff_parameters
  structure. Removed code duplication with do_diff_summarize and
  do_diff_summarize_peg by using the new helper functions.  Callers updated.
* subversion/libsvn_ra_dav/ra_dav.h
  (svn_ra_dav__do_diff): Added text_deltas boolean parameter.

* subversion/libsvn_ra_dav/fetch.c
  (svn_ra_dav__do_diff): Added text_deltas boolean parameter. Pass
  new parameter to make_reporter.

* subversion/libsvn_ra_local/ra_plugin.c
  (svn_ra_local__do_diff): Added text_deltas boolean parameter. Pass
  new parameter to make_reporter.

* subversion/libsvn_ra_svn/client.c
  (ra_svn_diff): Added text_deltas boolean parameter. Added text_deltas
  to "diff" cmd.

* subversion/libsvn_ra_svn/protocol
  (diff command): Added optional text-deltas parameter.
* subversion/svnserve/serve.c
  (diff): Added parsing of the new text_deltas parameter. Pass new
  parameter to accept_report.

r859553 | lundblad | 2006-05-01 16:33:20 +0000 (Mon, 01 May 2006)

In diff --summarize, don't show file with both text and prop modifications
as having only property modifications.

Suggested by: Stefan K√ľng <>
              Martin Hauner <>

* subversion/libsvn_client/repos_diff_summarize.c
  (ensure_summarize): Drop the sum_kind parameter.  Initialize the kind to
  (add_directory, add_file, apply_textdelta, change_prop): Initialize
  the summary kind if appropriate.

r860151 | rooneg | 2006-06-13 15:14:35 +0000 (Tue, 13 Jun 2006)

Fix issue #2515.  Merging an added directory on a deleted directory in
the target fails.  Includes a unit test to ensure this doesn't happen

Patch by: Martin Hauner <>

* subversion/libsvn_client/repos_diff.c
  (add_directory): always set lenient parameter of get_path_access
   to TRUE.

* subversion/tests/cmdline/
  (merge_added_dir_to_deleted_in_target): new test.
  (test_list): added new test.

r860248 | rooneg | 2006-06-19 17:27:51 +0000 (Mon, 19 Jun 2006)

Added XFail test that checks status -u -N output from different working

Patch by: Martin Hauner <>

* subversion/tests/cmdline/
  (status_nonrecursive_update_different_cwd): new test.
  (test_list): added status_nonrecursive_update_different_cwd.

r865591 | lgo | 2007-06-23 18:45:34 +0000 (Sat, 23 Jun 2007)

Fix backwards compatibility issue with svn_client_status2.

Suggested by: Martin Hauner <>

* subversion/include/svn_types.h
  (SVN_DEPTH_FROM_RECURSE_STATUS): add new macro, to be used when converting
   recursion (-N) to depth for status.

* subversion/libsvn_client/status.c
  (svn_client_status2): use the new macro to convert recursion to depth.

r872018 | kfogel | 2008-07-01 15:19:40 +0000 (Tue, 01 Jul 2008)

Fix two bugs in log message compatibility code.

Patch by: Martin Hauner <>

* subversion/libsvn_client/commit_util.c
  (svn_client__get_log_msg): Construct array using pointer size, not
    object size.  Pass the right parameter in a function call. 

r874561 | danielsh | 2008-11-30 21:31:48 +0000 (Sun, 30 Nov 2008)

Fixed backward compatibility bug: it was not possible to commit only
property changes on a folder with modified child items.

Patch by: Martin Hauner <>
(Martin found the bug in and wrote the fix to libsvn_client.)

* subversion/libsvn_client/deprecated.c
    Turn non recursive into svn_depth_empty instead of svn_depth_files.

* subversion/svn/main.c
  (main):  Map '-N' to '--depth=empty' for 'svn commit'.

* subversion/tests/cmdline/
    Fix the test to expect 'commit -N' to mean 'commit --depth=empty'.
    While here, extend the 'add' scenario in the test.

* subversion/tests/cmdline/
    Extract helper function and run it twice: with '-N' and
    with '--depth=empty'.
    Renamed from 'commit_propmods_with_depth_empty' and added 'depth_arg'

r879536 | gstein | 2009-09-19 12:08:50 +0000 (Sat, 19 Sep 2009)

Use result_pool/scratch_pool paradigm in libsvn_wc.

* subversion/libsvn_wc/log.h:
* subversion/libsvn_wc/log.c:
  (...): renamed all pool parameters to result_pool or scratch_pool, or
    split them into result_pool and scratch_pool depending on a functions
    pool usage.

* subversion/libsvn_wc/adm_ops.c:
* subversion/libsvn_wc/merge.c:
* subversion/libsvn_wc/props.c:
* subversion/libsvn_wc/update_editor.c:
  (...): adjusted all calls to log.h to use two pool parameters.

Patch by: Martin Hauner <martin.hauner{_at_}>

r879924 | gstein | 2009-10-07 21:55:01 +0000 (Wed, 07 Oct 2009)

Use result_pool/scratch_pool paradigm in libsvn_wc.

* subversion/libsvn_wc/copy.c:
  (...): renamed all pool parameters to result_pool or scratch_pool,
    depending on a functions pool usage.

* subversion/include/svn_wc.h:
  (svn_wc_copy3): updated comment and declaration.

Patch by: Martin Hauner <martin.hauner{_AT_}>