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

Changeset 874781 is being indexed.

* www/links.html: Add Chinese translation links.

* www/links.zh.html: Chinese translation based on English r34536

* subversion/libsvn_wc/props.c

(load_props): Don't check for an error twice, just check it once, and clear

or return it depending on what the error actually is.

Un-refactor a function in libsvn_wc. In attempting to consolidate accesses

to svn_wc__props_path(), this two-line function was adding extra indirection

and obfuscating my attempts to find all calls to the offending function.

* subversion/libsvn_wc/props.c

(get_prop_path): Remove.

(svn_wc__props_last_modified, svn_wc__loggy_props_delete,

svn_wc__props_delete): Inline the removed function.

* subversion/libsvn_wc/wc_db.h:

Add a few questions.

Tweak wc-ng db schema a bit.

* subversion/libsvn_wc/wc-metadata.sql3

(NODE): Add a last_mod_time column.

More work to consolidate calls to svn_wc__prop_path().

* subversion/libsvn_wc/props.c

(save_prop_file): Rename to...

(save_prop_tmp_file): ...this, and use the unique stream APIs to create

the tmp file.

(install_props_file, svn_wc__loggy_revert_props_create): Use the improved


Remove the tc-issue-3334 branch, merged to trunk in r34700.
Merge the tc-issue-3334 branch to trunk:

Fix part of issue #3334 "Tree conflict merry-go-round on update/switch".

This is the first case to be implemented: When "update" or "switch" deletes

something that is locally edited, as well as raising a tree conflict, the local

node should be scheduled for re-addition as a copy of the previously existing

version, so the user can keep their version simply by issuing an "svn resolved"


On the 'tc-issue-3334' branch:

Mark a test as XFail because the change in to make 'update' re-schedule the

tree conflict victim also exposes an unimplemented case where the target

should be skipped. Also tweak some comments.

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Tweak some comments.

* subversion/tests/cmdline/

(test_list): Mark tree_conflicts_on_update_2_3 as XFail because skipping

isn't yet implemented where anchor == target, the last part of the test.

On the 'tc-issue-3334' branch:

Adjust a failing test's expectation to match the new behaviour. However, it

still fails, because the behaviour isn't all there yet. (Skipping when anchor

== target still isn't implemented.) The test is 50. This is

the only failing test at the moment.

* subversion/tests/cmdline/svntest/

(deep_trees_tree_del_repos): New function.

(deep_trees_skipping_on_update): Make a further change in the repository so

that the update under test has an incoming change that it can attempt to

apply. (Previously this was not necessary because the conflict-raising

update had left the WC at its old base revision, but now the

conflict-raising update updates the base to the latest revision.)

* subversion/tests/cmdline/

(tree_conflicts_on_update_2_3): Adjust expectations.

On the tc-issue-3334 branch: Merge all changes from trunk up to r34695.

Correct the expectations of a test, brought to light by r34694.

* subversion/tests/cmdline/

(failed_anchor_is_target): Adjust.

Tweak a test function for correctness (though it didn't seem to cause a

problem) and improve its doc string.

* subversion/tests/cmdline/svntest/

(deep_trees_skipping_on_update): Document and tweak as above.

Check for an existing tree conflict before checking for other problems with

the node, when update adds a directory.

* subversion/libsvn_wc/update_editor.c

(add_directory): Move code around.

Fix compiler warning.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

(gnome_keyring_init): Pass a void argument in order to supress warning

of 'old-style function definition'.

A negative value to the retry_limit will re-prompt for user credentials

infinite times.

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c

(ssl_client_cert_pw_prompt_next_cred): Modified not to give up if a

negative value is given as retry_limit.

* subversion/libsvn_subr/ssl_client_cert_providers.c

(ssl_client_cert_prompt_next_cred): Modified not to give up if a

negative value is given as retry_limit.

* subversion/libsvn_subr/username_providers.c

(username_prompt_next_creds): Modified not to give up if a

negative value is given as retry_limit.

* subversion/libsvn_subr/simple_providers.c

(simple_prompt_next_creds): Modified not to give up if a

negative value is given as retry_limit.

* subversion/include/svn_client.h

* subversion/include/svn_auth.h

Fix doc to reflect above change.

Patch by: Alexander Thomas <>

Review by: me



(Tweaked by me, only the docs)

Removes gnome-keyring-result.h to make it compile with

old versions of gnome-keyring.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Removed reference to the header file.

Patch by: Alexander Thomas <>

Remove the last vestiges of the old names for the skel functions.

Removed some skel functions that nobody ever used.

* subversion/include/private/svn_skel.h:

(svn_skel__append, svn_skel__atom_matches_string, svn_skel__equal,

svn_skel__copy): removed

- removed #defines mapping old names to new

* subversion/libsvn_subr/skel.c:

(svn_skel__append, svn_skel__atom_matches_string, svn_skel__equal,

svn_skel__copy): removed

* subversion/libsvn_fs_base/util/fs_skels.c:

- renamed function calls to new skel names

Remove an unneeded include; it's inclusion throws off non-BDB builds.

* subversion/tests/libsvn_subr/skel-test.c:

- remove include of libsvn_fs_base/fs.h

Fix compiler warning of 'no previous prototype'.

* subversion/libsvn_subr/skel.c

(getsize): Mark the function as static.

(putsize): Mark the function as static.

Fix warning of signedness.

* subversion/libsvn_fs_base/util/fs_skels.c

(svn_fs_base__parse_representation_skel): Typecast 'const char' to

'const unsigned char' for checksum_skel->children->next->data.

Review by: hwright

Properly error on a commit attempted anywhere inside a tree-conflicted

working copy directory.

* subversion/libsvn_client/commit_util.c

(bail_on_tree_conflicted_ancestor): New helper function.

(svn_client__harvest_committables): Use new function on each explicit target.

On the tc-issue-3334 branch: Merge all changes from trunk up to r34684.

  1. … 34 more files in changeset.
* STATUS: Follow-up to r34683. This time I *actually* saved the file

before committing it.

* STATUS: Add a justification for r34547.
* STATUS: A couple of layout fixes.

* STATUS: A couple of layout fixes.

Merge r34653, r34656 from trunk:

* r34653, r34656

Don't autoupgrade ancient BDB filesystems to 1.5 or 1.4 format.


Small fix, but avoids confusing/surprising users.


+1: hwright, cmpilato, pburba

Merge r34506 from trunk:

* r34506

Fix a pair of bugs in the BDB backend's node-origins cache-miss fallback

logic, one of which can cause a SEGFAULT, the other of which can result

in an incorrect return value.


+1: cmpilato, glasser, pburba

* STATUS: Vote and approve r34653 group.