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

Changeset 1698056 is being indexed.

Merge r1697835 from trunk:

* r1697835

Fix compiler warning about const/non-const pointer conversion.


Whilst we don't usually backport compiler warning fixes, this one

is fallout from the r1696222 group backport.


+1: brane, rhuijben, stefan2

Merge the r1694481 group from trunk:

* r1694481, r1697824

Fix Unix build on systems without GPG agent.


This is a user-reported issue.


+1: brane, stefan2, rhuijben

+1: philip (without r1697824)

Merge r1694194 from trunk:

* r1694194

Correct a parameter name in svn_repos_get_fs_build_parser5.


The docstring shall match the actual declaration.


This is not an API change as it does not affect any user of that

function nor does it break binary compatibility. To keep the code

churn low, the implementation has not been updated - it happens to

use "parser" as the name of a local variable.


+1: stefan2, brane, rhuijben

Merge r1695022 from trunk:

* r1695022

Fix incomplete membuffer cache initialization.


Most users won't be hit by this because the OS hands out nicely zeroed

memory pages which we won't recycle until the end of the process. So,

this problem primarily hits people running a setup that deliberately

poisons memory upon allocation (APR pool debugging, MSVC debug malloc).

However, those who use very small caches and initialize them late in

the application's lifetime, might get recycled / "dirty" memory blocks

as well ending up with segfaults etc.


+1: stefan2, brane, rhuijben

Merge the r1687304 group from trunk:

* r1687304,1687389,1693135,1693138,1693159,1695600,1695606,1695681

Better configure detection of httpd version and auth fix.


Build out-of-the box on more platforms.


+1: philip, stefan2, brane

* CHANGES: Start populating the 1.9.1 section.
* branches/1.9.x/STATUS: Vote for r1697914 and the r1697381 group.

Document the idea behind the 'svnfsfs load-index' test.

No functional change.

* subversion/tests/cmdline/

(): Replace the global comment taken over from

* tools/client-side/svn-mergeinfo-normalizer

(svn:ignore): Set up standard ignores.

* STATUS: Add r1697967 (tests) to the r1697381 group (svnfsfs).
Provide a regression test for 'svnfsfs load-index' that covers all the

issues recently fixed for that sub-command.

This introduces a separate Python test script for svnfsfs. Coverage for

the remaining sub-commands will be added soon-ish.

* subversion/tests/cmdline/svntest/


run_and_verify_svnfsfs2): New functions for svnfsfs like we have them

for most other tools.

* subversion/tests/cmdline/

(): New test file, containing a single test atm. The header section

has been taken over from .

    • ?
Make 'svnadmin info' report the latest revision in the repository.

For now I use 'Revisions' as the label. We can change that later if necessary.

* subversion/svnadmin/svnadmin.c

(subcommand_info): Also print the HEAD revision.

* STATUS: Cast partial vote to checkpoint review process.
On the 'move-tracking-2' branch: Fix the 'mv' command and its notifications.

* subversion/svnmover/svnmover.c

(do_move): Calculate the moved-from path before moving the

element, as doing it afterwards is too late and so we were displaying

the target path instead.

(execute): When doing a normal move, don't then call the interactive

cross-branch move code as well, and don't display a notification here

because do_move() already did so.

On the 'move-tracking-2' branch: Cosmetic tweaks.

* subversion/svnmover/svnmover.c

(do_branch): Remove an obsolete comment. Tweak error message

style for consistency.

(do_topbranch): Tweak error message style for consistency.

In the 1.9 release notes, document the issues and workarounds for

svnfsfs load-index in 1.9.0.

* publish/docs/release-notes/1.9.html

(svnfsfs-index-manipulation): Add reference to the "known issues" section.

(svnfsfs-issues): New "known issues" section.

* STATUS: Withdraw r1694533 and propose r1697914 instead.
Revert part of r1485851. This is the alternative fix to r1694533.

* subversion/libsvn_ra_svn/marshal.c

(read_item): Go back to using standard APR array API functions.

Revert r1694533.
* STATUS: Approve the compiler warning fixes r1697835 and r1697845.
* STATUS: Cast vote. Approve another group.
Revert r1697900.
[Reverted in r1697901]

Instead of just casting a vote, I committed the actual change.

* STATUS: Cast vote. Approve another group.

* [And accidentally applied the change directly]

    • ?
* STATUS: Upgrade my vote to the r1694481 group to include r1697824.
On the 'move-tracking-2' branch: Add a TODO.


Add a suggestion to fill in the log message.

On the 'move-tracking-2' branch: Rename a function for consistency.

* subversion/include/private/svn_branch.h


(svn_branch_revision_root_new_eid): Renamed from



svn_branch_add_new_branch): Track the rename.

* subversion/libsvn_delta/compat3e.c

(editor3_new_eid): Track the rename.

* subversion/svnmover/svnmover.c


do_branch): Track the rename.

On the 'move-tracking-2' branch: Separate the repository-object API from the

rest of the branching API, into its own header and implementation files.

* subversion/include/private/svn_branch.h,


(svn_branch_repos_t): Leave the typedef here; make the struct definition

opaque, moving it to 'branch_repos.c'.







svn_branch_revision_root_get_base): Move these...

* subversion/include/private/svn_branch_repos.h,


... to these new files.

(svn_branch_repos_get_base_revision_root): Renamed from


(svn_branch_repos_add_revision): New.

* subversion/libsvn_delta/compat3e.c

Include 'svn_branch_repos.h'.

* subversion/libsvn_ra/ra_loader.c

Include 'svn_branch_repos.h'.


commit_callback_wrapper): Use 'svn_branch_repos_add_revision' instead of

direct access to the 'repos' structure.

* subversion/svnmover/svnmover.c

Include 'svn_branch_repos.h'.


display_diff_of_commit): Track the rename.

* STATUS: Cast some votes. Approve 2 groups.
* branches/1.9.x/STATUS: Approve the r1687304 group.
On the 'move-tracking-2' branch: Fix an error code path that is not

currently triggerable.

* subversion/svnmover/svnmover.c

(svn_branch_find_predecessor_el_rev): Properly return a null result.