Checkout Tools
  • last updated 35 mins ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 858263 is being indexed.

* www/merge-tracking/summit.html: HTML anchor adjustments.

Remove a CSS hack which I believe is only necessary on the home page.

* www/merge-tracking/summit.html

* www/merge-tracking/summit-survey.html

HTML tweak.

* www/merge-tracking/summit-survey.html: Set svn:mime-type to 'text/html'.

* www/merge-tracking/summit.html

Karl's notes from CollabNet's Merge Tracking Summit. Feedback from

rooneg, cmpilato, djames, and dlr still needs to be incorporated.

    • ?
* www/merge-tracking/

New directory which Merge Tracking requirements, specs, research,

etc. will live in.

* www/merge-tracking/summit-survey.html

Responses to a questionnaire sent out before CollabNet's Merge

Tracking Summit.

    • ?
* subversion/libsvn_fs_base/bdb/env.c (cleanup_env): Avoid unused variable

warning when !APR_HAS_THREADS.

A follow-up to r18179. No functional change.

* subversion/include/svn_client.h

(svn_client_log2): Adjust wording of @deprecated tag in doc string.

Suggested by: malcolm

Clarify how to run the python tests in a VPATH (srcdir != builddir) setup.

Patch by: Tobias Schäfer <>


* subversion/tests/cmdline/README

(How To Run The Tests): Add note about VPATH builds.

    • ?
* notes/commit-access-templates/contrib-committer.tmpl:

Change address from obsolete to


Capitalize 'Subversion'.

Tweak wording to be consistent with the fact that we now specify a role

alias email instead of a list of personal emails.

Explicitly specify that the new committer should add their COMMITTERS line,

as a test that their access is correctly configured.

During repos->wc diffs, handle files added to existing directories in

the same way as files added to added directories, fixing the former for

repos->BASE diffs.

* subversion/libsvn_wc/diff.c

(delete_entry): Replace logic for handling files deleted in the

BASE->repos diff with a call to report_wc_file_as_added().

Fix issue #2287, adding support for peg revisions to 'svn log' and its

underlying API.

* subversion/libsvn_client/log.c

(svn_client_log3): New function based on the previous incarnation of

svn_client_log2() which accepts a peg revision argument.

Highlights of this refactoring removed any meaningful use of

BASE_URL (now IGNORED_URL), and added a block which chooses the

appropriate (youngest) revision to use when opening a RA session.

(svn_client_log2): Delegate to svn_client_log3(), passing a

PEG_REVISION argument with a KIND of svn_opt_revision_unspecified.

* subversion/include/svn_client.h

(svn_client_log3): New declaration based on the previous incarnation

of svn_client_log2() which accepts a peg revision argument.

(svn_client_log2): Deprecated, and adjusted doc string.

* subversion/svn/log-cmd.c

(svn_cl__log): Remove extraneous comment, strip any peg revision off

of the end of the URI (storing it for later use), and update API to


* subversion/tests/cmdline/

(url_missing_in_head): Add peg revision to URI.

(log_through_copyfrom_history): Add peg revision to URI, and command


Patch by: me

S. Ramaswamy <>

Review by: lundblad



Vote for, and move into the approved changes region, r17992.
Stylistic refactoring of svn_client_log2(). No functional change.

* subversion/libsvn_client/log.c

(svn_client_log2): Leverage the extra stack frame used in the

middle of this function for just-in-time declarations of local

variables ERR, START_REVNUM, and END_REVNUM. Remove unnecessary

initialization of START_REVNUM and END_REVNUM.

* STATUS: Nominate (and vote for) r17280, r17992, and r18172.

Merge r17280 and r18172 from trunk.

Create branch for merging r17280 and r18172 to the 1.3.x branch.

Correct usage of the check_log_chain() function, which was being used

as a log chain validity predicate, but is implemented more as an

assertion. Also, improve its argument checking.

* subversion/tests/cmdline/

(check_log_chain): Tweak doc string. Check CHAIN list argument for

content before attempting a pop(), and raise svntest.Failure if

it's empty.

(plain_log, log_with_path_args, log_through_copyfrom_history,

log_limit): Remove unnecessary handling for a return value from

check_log_chain(), which never actually returns anything (only

raises exceptions).

* build/ac-macros/swig.m4

(SVN_FIND_SWIG): Allow SWIG 1.3.26 and 1.3.27.

Followup to r18170. Restore APR 1.x compatibility.

* subversion/libsvn_fs_base/env.c

(svn__atomic_cas): New macro, defined differently for APR 0.9.x and 1.x.

(bdb_cache_init): Change apr_atomic_cas to svn__atomic_cas.

Also fix comment.

In the BDB environment cache, implement an enumerated type using small integers

instead of self-referential pointers, thus allowing the use of apr_atomic_cas()

instead of apr_atomic_casptr(), thus avoiding breaking GCC's strict-aliasing

rules, and provoking warnings. Incidentally, it also avoids confusing humans,

which the use of self-referential pointers merely as unique tokens is prone to

do :-).

* subversion/libsvn_fs_base/bdb/env.c

(bdb_cache_start_init, bdb_cache_init_failed, bdb_cache_initialize):

Remove, replacing with...


BDB_CACHE_INITIIALISED): ...these #defined integer constants.

(bdb_cache_state): Change from a void* to an apr_uint32_t.

(bdb_cache_init): Adapt to the above changes, including replacing all

apr_atomic_casptr() with apr_atomic_cas().

* tools/hook-scripts/mailer/mailer.conf.example:

Some corrections and clarifications. cleanups.

Patch by: Mathias Weinert <>

[in tools/hook-scripts/mailer]

* Comment typo fix.

* mailer.conf.example: Add missing full stops.

(suppress_deletes): Comment out deprecated option.

Preparation for fixing issue #1809: replace svn_client_ls and

make recursive ls streamy.

* subversion/libsvn_client/ls.c (svn_client_ls4): Use svn_ra_stat()

and fall back to the old method of using svn_ra_check_path and

svn_ra_get_dir in the file case if necessary.

* www/index.html

Tweak the style overrides a bit. Pull the image back down into the

main HTML body (which moves the servlet links back to the top of the

visual frame), and lose that "Description" box.

* STATUS: Add r18164 to r18144, r18037, and r18127.
Remove tabs that crept into the BDB back-end code through the years.

* subversion/libsvn_fs_base/bdb/bdb-err.c,

subversion/libsvn_fs_base/trail.c: Untabify. Whitespace changes only.

* subversion/libsvn_client/ls.c (svn_client_ls4): Remove useless

comment and fix another.

* Remove comment about JavaHL's compile being "experimental".

Per discussion on dev list, revert r18040, re-instating GCC 4.0.1's

compilation warnings (which turn into build failures when using -Wall

-Werror). The Plan is to add compilation flags (likely

-Wno-uninitialized) for GCC which disable this type of warning.

* subversion/libsvn_wc/adm_files.c

* subversion/libsvn_subr/config_file.c

* subversion/tests/libsvn_delta/random-test.c

* subversion/libsvn_repos/load.c

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_delta/svndiff.c

* subversion/svn/lock-cmd.c

* subversion/libsvn_ra_dav/session.c

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/revs-txns.c

Revert r18040.

Review by: julianfoad



* subversion/libsvn_client/info.c (svn_client_info): Fix spacing.