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

Changeset 882257 is being indexed.

Apply ASF license headers to a number of files included under that license

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}>

  1. … 161 more files in changeset.
* STATUS: I've changed usernames.

Replace another use of access batons with the working copy locking APIs.

This has the side effect of allowing behavior that would otherwise error, so

update a test to expect the (improved) behavior.

* subversion/tests/cmdline/

(revert_inside_newly_added_dir): Update docs and expectation.

* subversion/libsvn_client/revert.c

(revert): Use the locking APIs in place of access batons.

When acquiring and releasing wc write locks, use the parent path for unknown

kinds in the working copy. Update 'add --parents' to ensure we release working

copy locks on error.

* subversion/libsvn_wc/lock.c

(svn_wc__acquire_write_lock, svn_wc__release_write_lock): Look at the parent

path if the kind is anything but a directory, rather than only for files.

* subversion/libsvn_client/add.c

(svn_client_add4): Make sure we release the lock if we encounter an error

while adding parents.

Revert r880584 to fix broken Windows debug build.

Note: r880584 was originally committed as r40510 of s.t.o.

The Windows debug build was broken by r880584 and I have been unable to fix

it. Per our HACKING rules I am reverting the change, for more details see

this thread:

When migrating properties for a replaced node, move base props into the WORKING


Found by: rhuijben

* subversion/libsvn_wc/upgrade.c

(migrate_props): Update documentation and properly migrate the base props

for replaced nodes.

French translation update for r881223

* subversion/po/fr.po: po-update + 1 new & 2 fuzzy fixed

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r882049, translate new strings.

* COMMITTERS: Update to my new ASF account.

Add a couple of working copy APIs to allow the client library to lock the

working copy, without the use of an intermediate access baton. Use these

APIs in svn_client_add4().

* subversion/include/private/svn_wc_private.h

(svn_wc__acquire_write_lock, svn_wc__release_write_lock): New.

* subversion/libsvn_wc/lock.c

(svn_wc__acquire_write_lock, svn_wc__release_write_lock): New.

* subversion/libsvn_wc/wc_db.c

(svn_wc__db_temp_mark_locked): When marking the pdh locked, create it

if needed.

* subversion/libsvn_client/add.c

(svn_client_add4): Replace access baton use with lock APIs instead.

Add 840074 to all revnums, except those in branch names.
Merge r881905 from trunk:

* r881905

Fix a segmentation fault in libsvn_fs_fs/fs_fs.c.


Passing NULL (or rather, 0) for a pool is a bad idea.


+1: steveking, stsp, hwright

* STATUS: Withdraw the r40485 group, which isn't ready for backport, and vote

for r881905.

Remove the use of a couple of access batons.

* subversion/libsvn_client/add.c

(add_parent_dirs): Use svn_wc_check_wc2() for its intended purpose, rather

than attemping to open a access baton. Also, use absolute paths


(svn_client_add4): Use absolute paths, and drop the access baton usage when

adding parent paths.

Fold several lengthy conditional statements of the form:

if (some_condition)


/* several 10s of lines of code here */


return SVN_NO_ERROR;


if (!some_condition)

return SVN_NO_ERROR;

/* several 10s of lines of code here */

return SVN_NO_ERROR;

The change helps us better recognize "early out" possibilities, as well as

make better use of horizontal space within the code. There should be no

functional changes in this patch.

* subversion/libsvn_client/merge.c

(find_gaps_in_merge_source_history, record_skips,

remove_children_with_deleted_mergeinfo, get_mergeinfo_paths,

process_children_with_new_mergeinfo, record_mergeinfo_for_added_subtrees,


Fold as described above.

* STATUS: Nominate r881905, and include steveking's implied +1 from dev@.

Avoid a segfault when committing.

* subversion/libsvn_fs_fs/fs_fs.c

(get_writable_proto_rev_body): Pass a valid memory pool instead of 0 to


Patch by: steveking

(committing on his behalf because his ASF ICLA is still being processed)

Update the BDB schema documentation to reflect changes that have been made

between Subversion 1.0 and 1.6.

* subversion/libsvn_fs_base/notes/structure

Several updates and clarifications.

* subversion/tests/cmdline/

(diff_renamed_file): Tweak some comments.

    • ?
Sync the 'authz-overhaul' branch up with trunk.

(Merged /subversion/trunk:r879262-881562.)

    • ?
    • ?
  1. … 1000 more files in changeset.
JavaHL: Update the blame APIs to be current with libsvn_client.

[ in subversion/bindings/javahl/ ]

* native/SVNClient.cpp

(blame): Bump the API version.

* native/BlameCallback.h

(callback, singleLine): Update to the new callback interface.

* native/BlameCallback.cpp

(callback, singleLine): Update to the new callback interface, and use

the new Java blame callback to push the data back to the caller.

* src/org/tigris/subversion/javahl/,


(blame): Rev the blame interface and it's implementors.

* src/org/tigris/subversion/javahl/

(blame): Same, and also add a wrapper for backward compat.

(BlameCallback2Wrapper): New.

* src/org/tigris/subversion/javahl/


* www/cvs-changelog.html:

Remove, since it's now part of our versioned history.

Update the drawing of the BDB schema structure for v1.6.

* subversion/libsvn_fs_base/notes/schema-bdb-1.6.svg

Show a few more links.

Tie an update test to its issue.

* subversion/tests/cmdline/

(update_deleted_locked_files): Note that this is a test for issue #3525

and that its XFailing status is dependent on a fix of that issue.

Add a drawing of the BDB schema structure for v1.6.

* subversion/libsvn_fs_base/notes/schema-bdb-1.6.svg: New drawing.

JavaHL: Bring the diff APIs up-to-date with the native library.

[ in subversion/bindings/javahl/ ]

* native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZ): Rename to...

(Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ): ..this, adding extra boolean parameter.

(Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZ): Rename to...

(Java_org_tigris_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Lorg_tigris_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2I_3Ljava_lang_String_2ZZZZ): ...this, adding extra boolean parameter.

* native/SVNClient.h,


(diff, diff, diff): Add extra boolean parameter, and update to new client


* src/org/tigris/subversion/javahl/,



(diff, diff): Add new diff APIs, deprecating the old ones.

* subversion/libsvn_wc/adm_ops.c

(svn_wc__internal_remove_from_revision_control): Don't try to destroy

a NULL adm_access. Fixes core dump observed when changing the scheme

of an external's URL from https:// to http:// and trying to update.

* STATUS: Vote for the giant r38325 group. Reviewing this was difficult.

A custom 1.6.x fix might have been better than backporting all of this.

But all changes look sound and the fix itself is pretty important,

so let's get it shipped ASAP.

* subversion/libsvn_client/merge.c

(record_mergeinfo_for_dir_merge): Fix indentation.