Checkout Tools
  • last updated 3 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 872636 is being indexed.

In the ctypes-python-bindings branch: Add TODO file for tasks that need

to be completed before release.

* TODO: Add new file.

    • ?
On the 1.5.x-issue2489 branch:

Backport r32550 from trunk to 1.5.x-issue2489 branch which fixes issue #3239.

Approved by: markphip

Add r32558 to the r32545 group, and vote for it. comment fix.

* subversion/tests/cmdline/

(merge_chokes_on_renamed_subtrees): Fix comment to reflect actual merge

source and target.

Fix SEGFAULT introduced in r32545.

* subversion/libsvn_fs_fs/tree.c

(fs_node_origin_rev): Avoid dup'ing a NULL pointer.

Follow-up to r32524 and r32527:

* subversion/include/svn_checksum.h

(svn_checksum, svn_checksum_empty_checksum): Add @since tags.

* subversion/include/svn_sha1.h

(svn_sha1_empty_string_digest, svn_sha1_digest_to_cstring_display,

svn_sha1_digest_to_cstring, svn_sha1_digests_match): Add @since tags and

fix indentation.

* subversion/libsvn_fs_base/util/fs_skels.c

(svn_fs_base__unparse_representation_skel): Fix indentation.

* subversion/libsvn_subr/sha1.c

(svn_sha1_digest_to_cstring_display): Fix indentation.

* subversion/tests/libsvn_subr/checksum-test.c

(test_checksum_parse): Remove needless space.

Follow-up to r32529:

* build.conf

(libsvn_subr.msvc-export): Fix order. No functional change.

Fix a segmentation fault in tree-conflicts detection.

Patch by: Neels Janosch Hofmeyr <>

* subversion/libsvn_client/merge.c

(merge_dir_opened): Disable the superfluous tree-conflicts detection for

the case adm_access == NULL, thereby avoiding a segmentation fault

when part of the incoming change is in a subdirectory of one that is not

present in the target. Add a detailed comment.

Remove the 1.5.x-ra_serf-backports branch, merged to 1.5.x in r32553.

Merge the 1.5.x-ra_serf-backports branch to 1.5.x:

* r31232, r31234, r31550, r31630

Set of revisions required to make 1.5.x pass all tests over ra_serf.

r31232 fixes blame test 16.

r31234 fixes AN API issue, solves merge conflict with r31313

r31550 fixes the 'check repo uuid on repo access' feature

r31630 fixes copy test 22.


With current HEAD of 1.5.x about 10 tests are failing, so that's quite a

regression. Changes nominated here touch code in ra_serf only and are low



A backport branch 1.5.x-ra_serf-backports has been created for this group,

including the already approved r31313.


+1: lgo, cmpilato, gstein

+0: arfrever

* r31313

Make all ra layers return a consistent error when a path is not

found in the repository.


Small change, but API consistency is always a good thing.


+1: lgo, cmpilato, jerenkrantz, arfrever

  1. … 8 more files in changeset.
* subversion/include/svn_wc.h: Mention path conventions in introduction.

See this message and the thread around it for more information:

From: "C. Michael Pilato" <>

To: Karl Fogel <>


Subject: Re: Relativeness of path arguments in libsvn_wc.

Date: Mon, 18 Aug 2008 09:50:25 -0400

Message-ID: <>

* STATUS: Move the r31232 group to Approved, and remove the r31313 group, which

is a subset of the r31232 group.

Fix issue #3239 - Use absolute, not relative, paths of the cert files

as keys in the client cert passphrase cache.

Patch by: stylesen

* subversion/libsvn_subr/prompt.c

(svn_cmdline_auth_ssl_client_cert_prompt): Get the absolute path of cert

file and set it in the credentials.

* subversion/include/svn_cmdline.h

(svn_cmdline_auth_ssl_client_cert_prompt): Document that an absolute path

of SSL client certificate filename will be recorded.

* subversion/include/svn_auth.h

(svn_auth_cred_ssl_client_cert_t): In the documentation

s/Full paths/Absolute path/

* STATUS: Vote for r32545.

Recommend r32545 for backport.
Vote for r32538.
approve the ra_serf changes.
Fix some pool usage problems in the FS backend node-origin calculation


* subversion/libsvn_fs_base/tree.c

(base_node_origin_rev): Use a second pool to avoid freeing memory

needed in a loop.

* subversion/libsvn_fs_fs/tree.c

(fs_node_origin_rev): Explicitly dup a node-ID into the pool we want

it in, as the fetching function doesn't always honor the provided pool.

Found by: vgeorgescu

Fix some build warnings caused, I think, by the recent merge of

checksum-related stuffs from the fs-rep-sharing branch.

* subversion/tests/libsvn_subr/checksum-test.c

(test_checksum_parse): Remove unused variable 'i'.

* subversion/libsvn_fs_base/dag.c

(svn_fs_base__dag_index_checksums): Remove unused (and seemingly

unfinished) function.

Fix tree-conflict XML output (for "svn info --xml").

This is a re-merge of r32381 which was reverted by r32451.

* subversion/svn/tree-conflicts.c

(svn_cl__append_tree_conflict_info_xml): Add missing "break" statements in

the switch.

Constify some pointer parameters.

This is a re-merge of r32380 which was reverted by r32451.

* subversion/include/svn_wc.h,




Add 'const' to some 'svn_wc_conflict_description_t' pointers.

* subversion/libsvn_wc/tree_conflicts.c

Add 'const' to some 'svn_wc_conflict_description_t' and 'char' pointers;

remove it from a plain 'char' argument.

* STATUS: Add r32538 to the r32417 group and approved r32417 with my vote.

* subversion/tests/cmdline/

(test_list): Remove 'XFail' from test 10 because r32539 made it pass.

On the tree-conflicts branch, merge outstanding changes from trunk

up to r32485.

This makes 10 XPASS, and

103 and 104 FAIL.

  1. … 150 more files in changeset.
* subversion/libsvn_ra_neon/session.c

(exchange_capabilities): Following up to r32417, stop setting up client

capabilities for this request, because they will now automatically

be added on every request by svn_ra_neon__request_dispatch.

On the tree-conflicts branch, merge outstanding changes from trunk

up to r32172.

  1. … 210 more files in changeset.
Fix a compiler warning.

* subversion/libsvn_subr/checksum.c

(): Fix compiler warning of 'implicit declaration of function' isxdigit

and isalpha by including ctype header file.

Approved by: kameshj

Small tweak to simplify "kind" reference.

* subversion/libsvn_subr/checksum.c

(svn_checksum_parse_hex): use param rather than deref'ing structure

Since it is always used with new checksums, update the checksum parsing API to

be a constructor.

Suggested by: gstein

* subversion/libsvn_subr/checksum.c

(svn_checksum_parse_hex): Create and return a new checksum, and also check for

parsing errors.

* subversion/tests/libsvn_subr/checksum-test.c

(test_checksum_parse): Update test to use new API.

* subversion/libsvn_fs_base/tree.c

(base_apply_textdelta, base_apply_text): Same.

* subversion/include/svn_error_codes.h

(SVN_ERR_BAD_CHECKSUM_PARSE): New error code for invalid checksum characters.

* subversion/include/svn_checksum.h

(svn_checksum_parse_hex): Accept a kind parameter, and return the new checksum.

Followup to r32524: Change the error number of SVN_ERR_BAD_CHECKSUM_KIND

to reflect its order.

* subversion/include/svn_error_codes.h

(SVN_ERR_BAD_CHECKSUM_KIND): Update the offset so that this error doesn't

duplicate another.