Jeremy Whitlock <>

r32368, r32367, r31936, r31918, r29175, r28893, r28374, r28083, r28009, r27875, r27668, r25383, r25362, r25031, r21719

r32368 | julianfoad | 2008-08-05 06:27:07 -0500 (Tue, 05 Aug 2008)

Fix a problem in where when removing a file, the value being used
for the deletion path referenced 'None' resulting in an error.

Patch by: Jeremy Whitlock <>

* tools/examples/
  (DiffEditor._do_diff): When a file is deleted, print its old path instead
    of trying to print its new path which is 'None'.

r32367 | julianfoad | 2008-08-05 06:14:03 -0500 (Tue, 05 Aug 2008)

Fix a problem in where diffing a versioned file produced an
'list index out of range' error in DiffEditor.apply_textdelta().

(A follow-up to r16215.)

Patch by: Jeremy Whitlock <>

* tools/examples/
  (DiffEditor.apply_textdelta): Removed third argument in _do_diff() call
    since it was unnecessary and referenced an invalid list index.

r31936 | hwright | 2008-06-30 23:30:01 -0500 (Mon, 30 Jun 2008)

Expose the depth member of svn_info_t to JavaHL's Info2 class.

Patch by: Jeremy Whitlock <> 

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/
  (testBasicInfo2): Updated tests to check depth.

* subversion/bindings/javahl/native/EnumMapper.h,
  (mapDepth): New.

* subversion/bindings/javahl/native/InfoCallback.cpp
  (createJavaInfo2): Updated to call new depth-aware constructor.

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/
  (Info2): Updated constructor for depth argument.
  (getDepth, setDepth): New functions. 

r31918 | psamuelson | 2008-06-30 00:56:10 -0500 (Mon, 30 Jun 2008)

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/
    (testBasicLocking): Fix a typo in a comment.
    (testBasicInfo2): Likewise.

Patch by: Jeremy Whitlock <>

r29175 | kfogel | 2008-02-03 23:10:12 -0600 (Sun, 03 Feb 2008)

Fix issue #2992: make 'svnadmin recover' warier for FSFS.

Patch by: Jeremy Whitlock <>
(Tweaked by me.)

* subversion/libsvn_fs_fs/fs_fs.c
  (recover_body): Check for missing or non-file revprops file for
    youngest revision, and check that maximum rev is as expected.

* subversion/tests/cmdline/ Import shutil.
  (fsfs_recover_handle_missing_revs_or_revprops_file): New test.
  (test_list): Run it.

r28893 | markphip | 2008-01-14 12:36:47 -0600 (Mon, 14 Jan 2008)

Note where you can get Subversion for AIX.

* www/project_packages.html
  Add section for AIX.

* www/images/aix.gif
  New AIX logo image.

Patch by: Jeremy Whitlock <>

r28374 | markphip | 2007-12-10 13:29:21 -0600 (Mon, 10 Dec 2007)

Followup to r27875.  Add logic to tell whether the path being diffed is the
same as the path the diff paths should be relative to.  In that scenario,
specify a path of '.' in the diff output, instead of throwing an error.

* subversion/libsvn_client/diff.c:
  (display_prop_diffs, diff_content_changed): Updated for new path check.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/
  (testDiff): Test scenario where path and relative path are the same.

Patch by: Jeremy Whitlock <>

r28083 | dlr | 2007-11-27 12:58:07 -0600 (Tue, 27 Nov 2007)

A follow-up to r27875 (for issue #2723), using clearer verbiage
regarding the RELATIVE_TO_DIR parameter being NULL.

* subversion/include/svn_client.h
  (svn_client_diff4): Document RELATIVE_TO_DIR more clearly.

* subversion/include/svn_diff.h
  (svn_diff_file_output_unified3): Document RELATIVE_TO_DIR more clearly.

Patch by: Jeremy Whitlock <>
Suggested by: glasser

r28009 | markphip | 2007-11-24 20:28:46 -0600 (Sat, 24 Nov 2007)

Follow-up to r27875 patch which fixes problem where the path has property
changes including svn:eol-style and svn:keywords.

* subversion/libsvn_diff/diff_file.c
  (svn_diff_file_output_unified3): Removed unnecessary handling of
   relative_to_dir argument.

* subversion/bindings/javahl/native/SVNClient.cpp
  (diff): Canonicalize relativeToDir before calling svn_client_diff4.

Patch by: Jeremy Whitlock <>

r27875 | dlr | 2007-11-16 16:11:38 -0600 (Fri, 16 Nov 2007)

Implement issue #2723, adding support to libsvn_client and libsvn_diff
to provide consumers with the ability to output unified diff paths
relative to a particular directory.

Update JavaHL to take advantage of this new functionality.

* subversion/include/svn_client.h
  (svn_client_diff4, svn_client_diff_peg4): Add new relative_to_dir
   argument (APIs already rev'd for 1.5).

* subversion/include/svn_diff.h
  (svn_diff_file_output_unified3): Rev'd from svn_diff_file_output_unified2()
   for new relative_to_dir argument.

* subversion/include/svn_error_codes.h
  (SVN_ERR_BAD_RELATIVE_PATH): Add new error code.

* subversion/libsvn_client/diff.c
  (MAKE_ERR_BAD_RELATIVE_PATH): Create an svn_error_t * of type
   SVN_ERR_BAD_RELATIVE_PATH with a useful error message.
  (diff_cmd_baton): Added relative_to_dir member.
  (display_prop_diffs): Add new relative_to_dir argument.
  (diff_content_changed, diff_file_deleted_no_diff, svn_client_diff4,
   diff_props_changed, svn_client_diff_peg4): Added support for new
   diff_cmd_baton->relative_to_dir member.
  (svn_client_diff3, svn_client_diff_peg3): Updated to handle relative_to_dir
   argument in rev'd functions.

* subversion/libsvn_diff/diff_file.c
  (svn_diff_file_output_unified): Implementation of
   svn_diff_file_output_unified3 which handles relative_to_dir argument.

* subversion/svn/diff-cmd.c
  (svn_cl__diff): Updated for rev'd versions of svn_client_diff() and

[ in subversion/bindings/javahl/ ]

* native/SVNClient.h
  (diff): Add new relativeToDir argument.

* native/SVNClient.cpp
  (diff): Add new relativeToDir argument.

* native/org_tigris_subversion_javahl_SVNClient.cpp
  (diff): Add new jrelativeToDir argument.

* src/org/tigris/subversion/javahl/
  (diff): Add new relativeToDir argument.

* src/org/tigris/subversion/javahl/
  (diff): Add new relativeToDir argument.

* src/org/tigris/subversion/javahl/
  (diff): Add new relativeToDir argument.

* tests/org/tigris/subversion/javahl/
  (testDiff): Unit tests.

Patch by: Jeremy Whitlock <>
          (Lion's share.)
Reviewed by: markphip

r27668 | kfogel | 2007-11-07 15:38:53 -0600 (Wed, 07 Nov 2007)

Add "--xml" support to "svn diff --summarize".  (Issue #2967)

Patch by: Jeremy Whitlock <>

* subversion/svn/diff-cmd.c: Include svn_xml.h.
  (kind_to_char): Renamed from text_mod_char.
  (kind_to_word): New function.
  (summarize_xml): New function.
  (summarize_regular): Renamed from summarize_func and updated for
    kind_to_char rename.
  (svn_cl__diff): Added "--xml" option to diff.

* subversion/svn/main.c
  (svn_cl__cmd_table): Support svn_cl__xml_opt.

*  subversion/tests/cmdline/
  (diff_summarize_xml): New test.
  (test_list): Run it.

* subversion/tests/cmdline/svntest/ Import parseString from
    from xml.dom.minidom.
  (run_and_verify_diff_summarize_xml): New function for running
    and verifying 'svn diff --summarize --xml'.

* subversion/svn/schema/diff.rnc: New file, Relax-NG schema for XML output.

r25383 | epg | 2007-06-12 22:25:53 -0500 (Tue, 12 Jun 2007)

Add option to resolve conflicts by selecting a specific file by adding
support to the svn executable to handle the "--accept" flag. The
"resolved" subcommand is the only subcommand using this new flag as
part of this patch. (Issue 2784)

* subversion/include/svn_client.h
  (svn_client_resolved): Revved to svn_client_resolved2() to handle the
  svn_accept_t enum.

* subversion/include/svn_types.h
  (svn_accept_t): Created an enum to handle the different accept options.
  (svn_accept_from_word): Function prototype to return the proper
  svn_accept_t based on the accept word.

* subversion/include/svn_wc.h
  (svn_wc_resolved_conflict): Revved to svn_wc_resolved_conflict3 to
  handle the svn_accept_t enum.

* subversion/libsvn_client/resolved.c
  (svn_client_resolved): Implementation of svn_client_resolved2()
  which now handles svn_accept_t as an argument.

* subversion/libsvn_subr/kitchensink.c
  (svn_accept_from_word): Implementation of svn_accept_from_word()
  which will return an svn_accept_t based on the passed accept string.

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Updated this function to handle an
  svn_accept_t argument. This is also where the real work of
  automatic conflict resolution happens.
  (resolve_callback_baton): Updated the structure to have a
  placeholder for the svn_accept_t argument so that
  resolve_found_entry_callback() can pass the necessary information
  to resolve_conflict_on_entry().
  (svn_wc_resolved_conflict): Implementation of
  svn_wc_resolved_conflict3() which now handles the svn_accept_t as
  an argument.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): Updated to have a place holder for the accept
  flag passed to the svn executable.
  (svn_cl__long_opt_t): Updated to handle the svn_accept_t as a long
  svn executable argument.

* subversion/svn/cl.h
  (svn_cl__opt_state_t): Updated to have a place holder for the accept
  flag passed to the svn executable.
  (svn_cl__long_opt_t): Updated to handle the svn_accept_t as a long
  svn executable argument.

* subversion/svn/main.c
  (svn_cl__options): Updated to have all necessary information for the
  svn executable to provide help for, and handle, the accept flag.
  (svn_cl__cmd_table): Updated to have the resolved subcommand handle
  the passing of the accept flag.
  (svn_cl__limit_opt): Added case statement to handle parsing the
  accept flag and erroring when an invalid argument was passed. If a
  valid argument is passed, it is then turned into the svn_accept_t enum
  based on the svn_accept_from_word() function in

* subversion/svn/resolved-cmd.c
  (svn_cl__resolved): Updated to call the revved svn_client_resolved()
  which is now at svn_client_resolved2().

* subversion/tests/cmdline/
  (automatic_conflict_resolution): Created a new test to test the
  handling of the new accept flag for the resolved subcommand.
  (test_list): Added the automatic_conflict_resolution test to the test list.

Patch by: Jeremy Whitlock <>
(Tweaked by me.)

r25362 | dlr | 2007-06-11 15:17:44 -0500 (Mon, 11 Jun 2007)

* www/project_packages.html
  Update description of Jeremy Whitlock's Universal Subversion Binary
  for Mac OS X.

Patch by: Jeremy Whitlock <>
(Tweaked by me.)

r25031 | sussman | 2007-05-15 15:02:18 -0500 (Tue, 15 May 2007)

* www/project_packages.html:  Link to spiffy CollabNet OS X binary installer.

Patch by: Jeremy Whitlock <>

r21719 | djames | 2006-09-29 17:48:54 -0500 (Fri, 29 Sep 2006)

* subversion/bindings/swig/python/tests/
  (test_dump_fs2): New test case.

Patch by: me
          Jeremy Whitlock <>