subversion

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

Changeset 869683 is being indexed.

* subversion/libsvn_subr/svn_base64.c

(reverse_base64): Define array.

(decode_bytes): Optimise firstly by avoiding unnecessary stringbuf

resizes, and secondly by using a lookup table to decode each

character, rather than a linear search with strchr.

* STATUS: Add r29607 to the 'log -g' group.

A couple of followups to r29542.

Suggested by: pburba

* subversion/libsvn_repos/log.c

(array_pop_front): Also decrement the number of allocated elements, so as to

avoid possibly memory issues if pushing additional elements on to the array

later. (See http://svn.haxx.se/dev/archive-2008-02/0730.shtml for

analysis.)

(compare_rangelist_paths): Flesh out doc string.

Add 29603 with r29600.

Introduced svn-status-default-status-arguments

Patch by Doug Hellmann <doug.hellmann@gmail.com>

* trunk/contrib/client-side/emacs/psvn.el:

(svn-status-default-status-arguments): New variable

(svn-status-1): Use svn-status-default-status-arguments

Merge r29594 from trunk:

* r29594

Avoids some test suite cleanup problems on Win32 [BDB] x [NEON | SVN].

No core code change, just the test suite.

Votes:

+1: pburba, epg

* subversion/tests/cmdline/svnsync_tests.py

(run_copy_revprops): Correct comment (pasto in r29600).

Nominate r29600.

Vote for r29594 and move it to the Approved section.

In svnsync:

r26470 changed all the subcommand batons to a shared implementation, with

each baton now allocated from a pool rather than on the stack, but

copy_revprops_cmd still passed the *address* of baton. To help prevent

such errors in the future, how about some type checking and testing?

* subversion/svnsync/main.c

(with_locked_func_t): Use subcommand_baton_t * not void *;

change all implementations.

(with_locked): Take subcommand_baton_t * not void *.

(copy_revprops_cmd): Pass baton to with_locked, not &baton.

* subversion/tests/cmdline/svnsync_tests.py

(run_copy_revprops): Add function to run copy-revprops.

(run_test): Call run_copy_revprops after run_sync.

Merge r29591 via svnmerge.py from trunk to 1.5.x.
* STATUS: Vote and approve r29591
Merge r29556 via svnmerge.py from trunk to 1.5.x.
* STATUS: Vote and approve r29556
* STATUS: Nominate r29594.

Avoid some test suite cleanup problems on Win32 BDB tests.

This solves some test cleanup failures I was experiencing on XP where BDB

repositories couldn't be removed with main.py:safe_rmtree() when testing

over ra_neon and ra_svn, see

http://svn.haxx.se/dev/archive-2008-02/0684.shtml. The ultimate cause of the

removal failures is unknown, but simply retrying the removal works.

* subversion/tests/cmdline/svnadmin_tests.py (test_create):

* subversion/tests/cmdline/svntest/main.py (run_tests):

Ask for a retry when using safe_rmtree() to delete up repositories.

* www/merge-tracking/design.html

(): Rename SVN_PROP_MERGE_INFO to SVN_PROP_MERGEINFO.

Nominate r29556 and r29591.

Don't print a warning about dump when we're pretending dump is verify.

* subversion/libsvn_repos/dump.c

(struct edit_baton): Add new verify field, indicating whether this

is a verify or not.

(dump_node): Don't warn about an incomplete dump if this is a verify.

(get_dump_editor): Set eb->verify to FALSE.

(svn_repos_verify_fs): Set eb->verify to TRUE.

On the tree-conflicts branch, apply a few fixes by Stephen Butler

and Neels Janosch Hofmeyr.

* subversion/libsvn_wc/tree_conflicts.c

(read_victim_path): Correct boolean expression in if statement.

Chaining checks for inequality with boolean OR does not make much sense.

Found by Neels.

(read_reason, svn_wc__write_tree_conflicts_to_entry): Add missing

case to switch statement. Found by Stephen.

* subversion/libsvn_client/info.c

(build_info_from_entry): Fix potential reference to uninitialized data.

Fix comment to explicitly mention that only this-dir entries

carry tree conflict data. Both found by Neels.

* subversion/libsvn_wc/questions.c: Same comment fix as in info.c

Patch by: Neels Janosch Hofmeyr <neels@elego.de>

Stephen Butler <sbutler@elego.de>

Merge r29390 from trunk:

* r29390

Fix incorrect filter usage in mod_dav_svn mirror code.

Votes:

+1: jerenkrantz

+0: cmpilato

Merge r29583 from trunk:

* r29583

Replace some abort's in ra_serf with errors.

Votes:

+1: lgo, cmpilato

Add design discussion notes by Stephen Butler.

* notes/tree-conflicts/detection.txt:

Expand on use cases 4 to 6 by describing the current plan for

finding in the repository history the information needed to

detect tree conflicts during merge.

Move "true rename" discussion to the end of the file.

Also improve wording of existing text a bit.

Patch by: Stephen Butler <sbutler@elego.de>

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

Merged revisions 28922-29581 via svnmerge from

https://svn.collab.net/repos/svn/trunk

    • ?
    /branches/tree-conflicts/subversion/libsvn_wc/adm_files.c
    • ?
    /branches/tree-conflicts/build/ac-macros/sqlite.m4
  1. … 259 more files in changeset.
Cast backport votes.
* STATUS: Nominate r29581 and r29583 for backport.
ra_serf: Remove abort's.

* subversion/libsvn_ra_serf/auth.c

(global): include svn_private_config.h for _() declaration.

(handle_basic_auth): replace abort's with error messages.

Merge r29484, r29508 from trunk:

* r29484, r29508

Add progress notification support for ra_serf.

Justification: Permits TSVN etc to get progress feedback from ra_serf

which has been a showstopper for TSVN considering ra_serf.

Note: this requires a yet unreleased version of serf to actually work.

Votes:

+1: jerenkrantz, lgo

ra_serf: Fix authentication fallback mechanism. If the server supports multiple

authentication schemes like NTLM or Basic, just try them one after the other in

the order as specified by the server in the response headers.

Found by: Bert Huijben <b.huijben@competence.biz>

* subversion/libsvn_ra_serf/auth.c

(svn_ra_serf__handle_auth): Parse the Authorization headers in two distinct

steps, as serf combines them into one separated by comma. Also ignore errors

in scheme initialisation or handling, instead try the other available

schemes.

Fix issue #3110.

* subversion/bindings/swig/perl/native/Client.pm: Fix documentation.

Patch by: Sergey Skvortsov